diff options
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 850356d7c3f..a8a6cf4af50 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -101,12 +101,12 @@ size_t strcspn(const char *s, const char *reject); # define strndup sandbox_strndup #endif +#ifndef __HAVE_ARCH_STRDUP extern char * strdup(const char *); extern char * strndup(const char *, size_t); - extern const char *strdup_const(const char *s); extern void kfree_const(const void *x); - +#endif #ifndef __HAVE_ARCH_STRSWAB extern char * strswab(const char *); #endif @@ -144,20 +144,7 @@ void *memchr_inv(const void *, int, size_t); * memory is available * */ -void *memdup(const void *src, size_t len); - -/** - * memdup_nul() - allocate a buffer and copy in the contents, appending a nul byte - * - * Note that this returns a valid pointer even if @len is 0 - * - * @src: data to copy in - * @len: number of bytes to copy - * Return: allocated buffer with the copied contents and an extra nul byte, - * or NULL if not enough memory is available - * - */ -void *memdup_nul(const void *src, size_t len); +char *memdup(const void *src, size_t len); unsigned long ustrtoul(const char *cp, char **endp, unsigned int base); unsigned long long ustrtoull(const char *cp, char **endp, unsigned int base); |