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

Remove xcalloc() and convert its callers to xzalloc(). About half of them

Browse Source 
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.
This commit is contained in:
Rob Landley
2006-08-03 20:07:35 +00:00
parent 86b4d64aa3
commit 081e38483e
15 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modutils/insmod.c
View File

@@ -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) {

4
modutils/modprobe.c
View File

@@ -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 );