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

Minor cleanups: Convert a few calloc() calls to xzalloc, remove unnecessary

Browse Source 
memset, collate variable declarations...
This commit is contained in:
Rob Landley
2006-05-21 18:30:35 +00:00
parent c020f5f518
commit 9ffd42317b
4 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
networking/udhcp/dhcpd.c
View File

@@ -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;
struct dhcpOfferedAddr *lease, static_lease;
uint32_t static_lease_ip;
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,

2
networking/udhcp/script.c
View File

@@ -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",