diff options
| author | Rob Landley <rob@landley.net> | 2006-05-19 20:36:49 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-05-19 20:36:49 +0000 |
| commit | 80b8ff07ca4c39114875c7fd3230c4e9ae823f83 (patch) | |
| tree | 0595f3f0671af4a40d5ee87c18bcf4dc4def3a41 | |
| parent | b1629b1b2abc17a6430e4173d64d7956784118e0 (diff) | |
| download | busybox-w32-80b8ff07ca4c39114875c7fd3230c4e9ae823f83.tar.gz busybox-w32-80b8ff07ca4c39114875c7fd3230c4e9ae823f83.tar.bz2 busybox-w32-80b8ff07ca4c39114875c7fd3230c4e9ae823f83.zip | |
A pending item in my tree I might as well check in: I plan to migrate calloc()
and bb_calloc() calls to bb_xzalloc() which allocates prezeroed memory but
only takes one argument (the size).
| -rw-r--r-- | include/libbb.h | 1 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 461c28fcb..ca3afea98 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -183,6 +183,7 @@ void run_applet_by_name(const char *name, int argc, char **argv); | |||
| 183 | * to have the prototypes here unconditionally. */ | 183 | * to have the prototypes here unconditionally. */ |
| 184 | extern void *xmalloc(size_t size); | 184 | extern void *xmalloc(size_t size); |
| 185 | extern void *xrealloc(void *old, size_t size); | 185 | extern void *xrealloc(void *old, size_t size); |
| 186 | extern void *xzalloc(size_t size); | ||
| 186 | extern void *xcalloc(size_t nmemb, size_t size); | 187 | extern void *xcalloc(size_t nmemb, size_t size); |
| 187 | 188 | ||
| 188 | extern char *bb_xstrdup (const char *s); | 189 | extern char *bb_xstrdup (const char *s); |
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index fa6aa0f9f..d3c9e41e1 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
| @@ -37,6 +37,15 @@ void *xrealloc(void *ptr, size_t size) | |||
| 37 | } | 37 | } |
| 38 | #endif | 38 | #endif |
| 39 | 39 | ||
| 40 | #ifdef L_xzalloc | ||
| 41 | void *xzalloc(size_t size) | ||
| 42 | { | ||
| 43 | void *ptr = xmalloc(size); | ||
| 44 | memset(ptr, 0, size); | ||
| 45 | return ptr; | ||
| 46 | } | ||
| 47 | #endif | ||
| 48 | |||
| 40 | #ifdef L_xcalloc | 49 | #ifdef L_xcalloc |
| 41 | void *xcalloc(size_t nmemb, size_t size) | 50 | void *xcalloc(size_t nmemb, size_t size) |
| 42 | { | 51 | { |
