From: Simon Glass <sjg@chromium.org>
Date: Mon, 3 Feb 2020 14:36:00 +0000 (-0700)
Subject: string: Allow arch override of strndup() also
X-Git-Tag: v2020.04-rc2~2^2~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1ea1c7d80f9dd7a4827cddf25fba71d0034510e4;p=oweals%2Fu-boot.git

string: Allow arch override of strndup() also

At present architectures can override strdup() but not strndup(). Use
the same option for both.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/include/linux/string.h b/include/linux/string.h
index 5d63be4ce5..bb1d5ab07e 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -93,8 +93,8 @@ size_t strcspn(const char *s, const char *reject);
 
 #ifndef __HAVE_ARCH_STRDUP
 extern char * strdup(const char *);
-#endif
 extern char * strndup(const char *, size_t);
+#endif
 #ifndef __HAVE_ARCH_STRSWAB
 extern char * strswab(const char *);
 #endif
diff --git a/lib/string.c b/lib/string.c
index 9b779ddc3b..ae7835f600 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -324,7 +324,6 @@ char * strdup(const char *s)
 	strcpy (new, s);
 	return new;
 }
-#endif
 
 char * strndup(const char *s, size_t n)
 {
@@ -348,6 +347,7 @@ char * strndup(const char *s, size_t n)
 
 	return new;
 }
+#endif
 
 #ifndef __HAVE_ARCH_STRSPN
 /**