diff options
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/xfuncs_printf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index d29acebcd..fc630d176 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c | |||
@@ -91,13 +91,10 @@ char* FAST_FUNC xstrdup(const char *s) | |||
91 | 91 | ||
92 | // Die if we can't allocate n+1 bytes (space for the null terminator) and copy | 92 | // Die if we can't allocate n+1 bytes (space for the null terminator) and copy |
93 | // the (possibly truncated to length n) string into it. | 93 | // the (possibly truncated to length n) string into it. |
94 | char* FAST_FUNC xstrndup(const char *s, int n) | 94 | char* FAST_FUNC xstrndup(const char *s, size_t n) |
95 | { | 95 | { |
96 | char *t; | 96 | char *t; |
97 | 97 | ||
98 | if (ENABLE_DEBUG && s == NULL) | ||
99 | bb_simple_error_msg_and_die("xstrndup bug"); | ||
100 | |||
101 | t = strndup(s, n); | 98 | t = strndup(s, n); |
102 | 99 | ||
103 | if (t == NULL) | 100 | if (t == NULL) |
@@ -106,7 +103,7 @@ char* FAST_FUNC xstrndup(const char *s, int n) | |||
106 | return t; | 103 | return t; |
107 | } | 104 | } |
108 | 105 | ||
109 | void* FAST_FUNC xmemdup(const void *s, int n) | 106 | void* FAST_FUNC xmemdup(const void *s, size_t n) |
110 | { | 107 | { |
111 | return memcpy(xmalloc(n), s, n); | 108 | return memcpy(xmalloc(n), s, n); |
112 | } | 109 | } |