diff options
author | Rob Landley <rob@landley.net> | 2006-08-03 20:07:35 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-08-03 20:07:35 +0000 |
commit | 081e38483ec55dcfca3d92434fe94f0777ed962d (patch) | |
tree | 2d31e921a759c769f339055c9946205fabef5cbf /libbb | |
parent | 86b4d64aa3f5ca4c2824a8948541b0e18dfe0a74 (diff) | |
download | busybox-w32-081e38483ec55dcfca3d92434fe94f0777ed962d.tar.gz busybox-w32-081e38483ec55dcfca3d92434fe94f0777ed962d.tar.bz2 busybox-w32-081e38483ec55dcfca3d92434fe94f0777ed962d.zip |
Remove xcalloc() and convert its callers to xzalloc(). About half of them
were using "1" as one of the arguments anyway, and as for the rest a multiply
and a push isn't noticeably bigger than pushing two arguments on the stack.
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/xfuncs.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 699d09c67..31f0febca 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
@@ -41,15 +41,6 @@ void *xzalloc(size_t size) | |||
41 | } | 41 | } |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | #ifdef L_xcalloc | ||
45 | void *xcalloc(size_t nmemb, size_t size) | ||
46 | { | ||
47 | void *ptr = calloc(nmemb, size); | ||
48 | if (ptr == NULL && nmemb != 0 && size != 0) | ||
49 | bb_error_msg_and_die(bb_msg_memory_exhausted); | ||
50 | return ptr; | ||
51 | } | ||
52 | #endif | ||
53 | #endif /* DMALLOC */ | 44 | #endif /* DMALLOC */ |
54 | 45 | ||
55 | #ifdef L_xstrdup | 46 | #ifdef L_xstrdup |