X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=src%2Fother.c;h=5e887e6f5f6593f37b96dfc2a9c447ab90452052;hb=e299e7fce261036090d78547a91cfeb840d5a6ce;hp=21a763ac787cd27e28d6f8cfc64266ba4c066c47;hpb=b492802dfa7bf928bbafe74194ca4f154c70f743;p=debian%2Fdhcpd-pools.git

diff --git a/src/other.c b/src/other.c
index 21a763a..5e887e6 100644
--- a/src/other.c
+++ b/src/other.c
@@ -28,9 +28,9 @@
 extern void exit();
 extern char *malloc();
 #endif				/* STDC_HEADERS */
-#include <errno.h>
 #include <err.h>
-#include <stdarg.h>
+#include <errno.h>
+#include <stddef.h>
 #ifdef  HAVE_STRING_H
 #include <string.h>
 #else
@@ -85,25 +85,22 @@ void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
 /* Free memory, flush buffers etc */
 void clean_up(void)
 {
-	int ret;
+	unsigned int i;
 
 	/* Just in case there something in buffers */
-	ret = fflush(stdout);
-	if (errno || ret) {
-		warn("clean_up: stdout");
+	if (fflush(NULL)) {
+		warn("clean_up: fflush");
 	}
-	ret = fflush(stderr);
-	if (errno || ret) {
-		warn("clean_up: stderr");
+	num_shared_networks++;
+	for (i = 0; i < num_shared_networks; i++) {
+		free((shared_networks + i)->name);
 	}
-
 	free(config.dhcpdconf_file);
 	free(config.dhcpdlease_file);
 	free(config.output_file);
 	free(ranges);
 	free(leases);
 	free(touches);
-	free(shared_net_names);
 	free(shared_networks);
 }
 
@@ -126,38 +123,38 @@ void usage(int status)
 	FILE *out;
 	out = status != 0 ? stderr : stdout;
 
-	fprintf(out, "\
-Usage: %s [OPTIONS]\n", program_invocation_short_name);
+	fprintf(out, "\n\
+Usage: %s [OPTIONS]\n\n", program_invocation_short_name);
 	fprintf(out, "\
 This is ISC dhcpd pools usage analyzer.\n\
 \n");
 	fprintf(out, "\
-  -c --config   file    path to the dhcpd.conf file\n\
-  -l --leases   file    path to the dhcpd.leases file\n\
-  -f --format   [thcxX]   output format\n");
+  -c, --config=FILE      path to the dhcpd.conf file\n\
+  -l, --leases=FILE      path to the dhcpd.leases file\n\
+  -f, --format=[thHcxX]  output format\n");
 	fprintf(out, "\
-                          t for text\n\
-                          h for html table\n\
-                          H for full html page\n\
-                          x for xml\n\
-                          X for xml with active lease details\n\
-                          c for comma separated values\n");
+                           t for text\n\
+                           h for html table\n\
+                           H for full html page\n\
+                           x for xml\n\
+                           X for xml with active lease details\n\
+                           c for comma separated values\n");
 	fprintf(out, "\
-  -s --sort [nimcptTe]  sort ranges by\n\
-                          n name\n\
-                          i IP\n\
-                          m maxium\n\
-                          c current\n\
-                          p percent\n\
-                          t touched\n\
-                          T t+c\n\
-                          e t+c perc\n");
+  -s, --sort=[nimcptTe]  sort ranges by\n\
+                           n name\n\
+                           i IP\n\
+                           m maxium\n\
+                           c current\n\
+                           p percent\n\
+                           t touched\n\
+                           T t+c\n\
+                           e t+c perc\n");
 	fprintf(out, "\
-  -r --reverse		reverse order sort\n\
-  -o --output   file    output into a file\n\
-  -L --limit    nr      output limit mask 77 - 00\n\
-  -v --version          version information\n\
-  -h --help             this screen\n\
+  -r, --reverse		 reverse order sort\n\
+  -o, --output=FILE      output into a file\n\
+  -L, --limit=NR         output limit mask 77 - 00\n\
+  -v, --version          version information\n\
+  -h, --help             this screen\n\
 \n\
 Report bugs to <%s>\n\
 Homepage: %s\n", PACKAGE_BUGREPORT, PACKAGE_URL);