[14/33] string: Allow arch override of strndup() also
diff mbox series

Message ID 20200112120216.14.Ic29632a2599ba5f6d287e5ac8491d9745979d3e9@changeid
State Superseded
Delegated to: Simon Glass
Headers show
Series
  • sandbox: Move to SDL2
Related show

Commit Message

Simon Glass Jan. 12, 2020, 7:06 p.m. UTC
At present architectures can override strdup() but not strndup(). Use
the same option for both.

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

 include/linux/string.h | 2 +-
 lib/string.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox series

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
 /**