headers: include-what-you-use fixes

[debian/dhcpd-pools.git] / src / dhcpd-pools.c

diff --git a/src/dhcpd-pools.c b/src/dhcpd-pools.c
index db8495b..232ed94 100644 (file)
--- a/src/dhcpd-pools.c
+++ b/src/dhcpd-pools.c
@@ -20,9 +20,6 @@
 #endif
 
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef  HAVE_STDLIB_H
 #include <stdlib.h>
 #else                          /* Not STDC_HEADERS */
@@ -33,12 +30,12 @@ extern char *malloc();
 #else
 #include <strings.h>
 #endif
-#include <getopt.h>
-#include <errno.h>
 #include <err.h>
+#include <errno.h>
+#include <getopt.h>
 
-#include "dhcpd-pools.h"
 #include "defaults.h"
+#include "dhcpd-pools.h"
 
 int main(int argc, char **argv)
 {
@@ -189,9 +186,7 @@ int main(int argc, char **argv)
 
        /* Do the job */
        prepare_memory();
-       parse_config(true, config.dhcpdconf_file, shared_net_names,
-                    shared_net_names + strlen(shared_net_names) + 1,
-                    shared_networks);
+       parse_config(true, config.dhcpdconf_file, shared_networks);
 
        parse_leases();
        prepare_data();
@@ -217,13 +212,12 @@ int prepare_memory()
        num_ranges = num_shared_networks = 0;
        shared_networks =
            safe_malloc(sizeof(struct shared_network_t) * SHARED_NETWORKS);
-       shared_net_names =
-           safe_malloc(sizeof(char) * SHARED_NETWORKS_NAMES);
 
        ranges = safe_malloc(sizeof(struct range_t) * RANGES);
        macaddr = NULL;
 
        /* First shared network entry is all networks */
-       strcpy(shared_net_names, "All networks");
+       shared_networks->name = safe_strdup("All networks");
+
        return 0;
 }