diff options
| -rw-r--r-- | editors/awk.c | 16 | ||||
| -rw-r--r-- | editors/sed.c | 4 | ||||
| -rw-r--r-- | networking/udhcp/dhcpd.c | 24 | ||||
| -rw-r--r-- | networking/udhcp/script.c | 2 |
4 files changed, 17 insertions, 29 deletions
diff --git a/editors/awk.c b/editors/awk.c index f4eb1ab90..74f9d8e54 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -474,9 +474,9 @@ static xhash *hash_init(void) { xhash *newhash; - newhash = (xhash *)xcalloc(1, sizeof(xhash)); + newhash = (xhash *)xzalloc(sizeof(xhash)); newhash->csize = FIRST_PRIME; - newhash->items = (hash_item **)xcalloc(newhash->csize, sizeof(hash_item *)); + newhash->items = (hash_item **)xzalloc(newhash->csize * sizeof(hash_item *)); return newhash; } @@ -505,7 +505,7 @@ static void hash_rebuild(xhash *hash) return; newsize = PRIMES[hash->nprime++]; - newitems = (hash_item **)xcalloc(newsize, sizeof(hash_item *)); + newitems = (hash_item **)xzalloc(newsize * sizeof(hash_item *)); for (i=0; i<hash->csize; i++) { hi = hash->items[i]; @@ -536,7 +536,7 @@ static void *hash_find(xhash *hash, const char *name) hash_rebuild(hash); l = strlen(name) + 1; - hi = xcalloc(sizeof(hash_item) + l, 1); + hi = xzalloc(sizeof(hash_item) + l); memcpy(hi->name, name, l); idx = hashidx(name) % hash->csize; @@ -993,7 +993,7 @@ static node *new_node(uint32_t info) { register node *n; - n = (node *)xcalloc(sizeof(node), 1); + n = (node *)xzalloc(sizeof(node)); n->info = info; n->lineno = lineno; return n; @@ -1095,7 +1095,7 @@ static node *parse_expr(uint32_t iexp) case TC_NUMBER: case TC_STRING: cn->info = OC_VAR; - v = cn->l.v = xcalloc(sizeof(var), 1); + v = cn->l.v = xzalloc(sizeof(var)); if (tc & TC_NUMBER) setvar_i(v, t.number); else @@ -1104,7 +1104,7 @@ static node *parse_expr(uint32_t iexp) case TC_REGEXP: mk_re_node(t.string, cn, - (regex_t *)xcalloc(sizeof(regex_t),2)); + (regex_t *)xzalloc(sizeof(regex_t)*2)); break; case TC_FUNCTION: @@ -1590,7 +1590,7 @@ static void hashwalk_init(var *v, xhash *array) free(v->x.walker); v->type |= VF_WALK; - w = v->x.walker = (char **)xcalloc(2 + 2*sizeof(char *) + array->glen, 1); + w = v->x.walker = (char **)xzalloc(2 + 2*sizeof(char *) + array->glen); *w = *(w+1) = (char *)(w + 2); for (i=0; i<array->csize; i++) { hi = array->items[i]; diff --git a/editors/sed.c b/editors/sed.c index 893931153..39b28d006 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -449,7 +449,7 @@ static char *parse_cmd_args(sed_cmd_t *sed_cmd, char *cmdstr) parse_escapes(match,match,strlen(match),i,i); parse_escapes(replace,replace,strlen(replace),i,i); - sed_cmd->string = xcalloc(1, (strlen(match) + 1) * 2); + sed_cmd->string = xzalloc((strlen(match) + 1) * 2); for (i = 0; match[i] && replace[i]; i++) { sed_cmd->string[i * 2] = match[i]; sed_cmd->string[(i * 2) + 1] = replace[i]; @@ -513,7 +513,7 @@ static void add_cmd(char *cmdstr) * part1 part2 part3 */ - sed_cmd = xcalloc(1, sizeof(sed_cmd_t)); + sed_cmd = xzalloc(sizeof(sed_cmd_t)); /* first part (if present) is an address: either a '$', a number or a /regex/ */ cmdstr += get_address(cmdstr, &sed_cmd->beg_line, &sed_cmd->beg_match); diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 0dfc0b559..28acb6bcc 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c @@ -52,30 +52,18 @@ struct dhcpOfferedAddr *leases; struct server_config_t server_config; -#ifdef COMBINED_BINARY int udhcpd_main(int argc, char *argv[]) -#else -int main(int argc, char *argv[]) -#endif { fd_set rfds; struct timeval tv; - int server_socket = -1; - int bytes, retval; + int server_socket = -1, bytes, retval, max_sock; struct dhcpMessage packet; - uint8_t *state; - uint8_t *server_id, *requested; - uint32_t server_id_align, requested_align; - unsigned long timeout_end; + uint8_t *state, *server_id, *requested; + uint32_t server_id_align, requested_align, static_lease_ip; + unsigned long timeout_end, num_ips; struct option_set *option; - struct dhcpOfferedAddr *lease; - struct dhcpOfferedAddr static_lease; - int max_sock; - unsigned long num_ips; - - uint32_t static_lease_ip; + struct dhcpOfferedAddr *lease, static_lease; - memset(&server_config, 0, sizeof(struct server_config_t)); read_config(argc < 2 ? DHCPD_CONF_FILE : argv[1]); /* Start the log, sanitize fd's, and write a pid file */ @@ -96,7 +84,7 @@ int main(int argc, char *argv[]) server_config.max_leases = num_ips; } - leases = xcalloc(server_config.max_leases, sizeof(struct dhcpOfferedAddr)); + leases = xzalloc(server_config.max_leases * sizeof(struct dhcpOfferedAddr)); read_leases(server_config.lease_file); if (read_interface(server_config.interface, &server_config.ifindex, diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c index b6b0e0d59..2a4732104 100644 --- a/networking/udhcp/script.c +++ b/networking/udhcp/script.c @@ -159,7 +159,7 @@ static char **fill_envp(struct dhcpMessage *packet) if (!(over & SNAME_FIELD) && packet->sname[0]) num_options++; } - envp = xcalloc(sizeof(char *), num_options + 5); + envp = xzalloc(sizeof(char *) * (num_options + 5)); j = 0; asprintf(&envp[j++], "interface=%s", client_config.interface); asprintf(&envp[j++], "%s=%s", "PATH", |