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 /modutils | |
| parent | 86b4d64aa3f5ca4c2824a8948541b0e18dfe0a74 (diff) | |
| download | busybox-081e38483ec55dcfca3d92434fe94f0777ed962d.tar.gz | |
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 'modutils')
| -rw-r--r-- | modutils/insmod.c | 2 | ||||
| -rw-r--r-- | modutils/modprobe.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index be41e4449..614eb2f6b 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -3490,7 +3490,7 @@ static struct obj_file *obj_load(FILE * fp, int loadprogbits) /* Allocate space for a table of local symbols. */ j = f->local_symtab_size = sec->header.sh_info; - f->local_symtab = xcalloc(j, sizeof(struct obj_symbol *)); + f->local_symtab = xzalloc(j * sizeof(struct obj_symbol *)); /* Insert all symbols into the hash table. */ for (j = 1, ++sym; j < nsym; ++j, ++sym) { diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 5a94c7c92..efb119e3e 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -294,10 +294,10 @@ static void include_conf ( struct dep_t **first, struct dep_t **current, char *b if ( parse_tag_value ( buffer + 6, &alias, &mod )) { /* handle alias as a module dependent on the aliased module */ if ( !*current ) { - (*first) = (*current) = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t )); + (*first) = (*current) = (struct dep_t *) xzalloc (sizeof ( struct dep_t )); } else { - (*current)-> m_next = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t )); + (*current)-> m_next = (struct dep_t *) xzalloc (sizeof ( struct dep_t )); (*current) = (*current)-> m_next; } (*current)-> m_name = xstrdup ( alias ); |