emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A pending item in my tree I might as well check in: I plan to migrate calloc()

Browse Source 
and bb_calloc() calls to bb_xzalloc() which allocates prezeroed memory but
only takes one argument (the size).
This commit is contained in:
Rob Landley 2006-05-19 20:36:49 +00:00
parent b1629b1b2a
commit 80b8ff07ca
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libbb.h
View File

@ -183,6 +183,7 @@ void run_applet_by_name(const char *name, int argc, char **argv);
* to have the prototypes here unconditionally. */ * to have the prototypes here unconditionally. */
extern void *xmalloc(size_t size); extern void *xmalloc(size_t size);
extern void *xrealloc(void *old, size_t size); extern void *xrealloc(void *old, size_t size);
extern void *xzalloc(size_t size);
extern void *xcalloc(size_t nmemb, size_t size); extern void *xcalloc(size_t nmemb, size_t size);
extern char *bb_xstrdup (const char *s); extern char *bb_xstrdup (const char *s);

9
libbb/xfuncs.c
View File

@ -37,6 +37,15 @@ void *xrealloc(void *ptr, size_t size)
} }
#endif #endif
#ifdef L_xzalloc
void *xzalloc(size_t size)
{
void *ptr = xmalloc(size);
memset(ptr, 0, size);
return ptr;
}
#endif
#ifdef L_xcalloc #ifdef L_xcalloc
void *xcalloc(size_t nmemb, size_t size) void *xcalloc(size_t nmemb, size_t size)
{ {