X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fdhcpd-pools.c;h=02669d2a3c624f13c573bab3b1b7f337bdcdca8a;hb=93bcd305c40583bf7b7c611896f85b89899d47b5;hp=1e1c377b65e8fb11f29f64750a0404119833666b;hpb=17429ef85bfb4bdf51f4a659443fe4c31c972928;p=debian%2Fdhcpd-pools.git

diff --git a/src/dhcpd-pools.c b/src/dhcpd-pools.c
index 1e1c377..02669d2 100644
--- a/src/dhcpd-pools.c
+++ b/src/dhcpd-pools.c
@@ -114,7 +114,8 @@ int main(int argc, char **argv)
 			/* Output sorting option */
 			sorts = strlen(optarg);
 			if (5 < sorts) {
-				warnx("main: only first 5 sort orders will be used");
+				warnx
+				    ("main: only first 5 sort orders will be used");
 				strncpy(config.sort, optarg, (size_t) 5);
 				sorts = 5;
 			} else {
@@ -150,7 +151,6 @@ int main(int argc, char **argv)
 		case 'v':
 			/* Print version */
 			print_version();
-			return (EXIT_SUCCESS);
 		case 'h':
 			/* Print help */
 			usage(EXIT_SUCCESS);
@@ -193,12 +193,6 @@ int main(int argc, char **argv)
 		     shared_net_names + strlen(shared_net_names) + 1,
 		     shared_networks);
 
-	/* FIXME: move to output.c and use FILE *outfile */
-	if ((config.output_format[0] == 'x')
-	    || (config.output_format[0] == 'X')) {
-		printf("<dhcpstatus>\n");
-	};
-
 	parse_leases();
 	prepare_data();
 	do_counting();
@@ -211,20 +205,14 @@ int main(int argc, char **argv)
 	}
 	free(tmp_ranges);
 	output_analysis();
-	/* After fopen in ouput ioctl does like /dev/null which
+	/* After fopen in output ioctl does like /dev/null which
 	 * cause ENOTTY, and clean_up will see that without this
 	 * reset. At least linux does this, and possibly some
 	 * other systems. There's a report from FreeBSD 8.0 which
-	 * matches quite well with the symptom. */
+	 * matches quite well with this symptom. */
 	if (errno == 25)
 		errno = 0;
 
-	/* FIXME: move to output.c and use FILE *outfile */
-	if ((config.output_format[0] == 'x')
-	    || (config.output_format[0] == 'X')) {
-		printf("</dhcpstatus>\n");
-	};
-
 	clean_up();
 	return (EXIT_SUCCESS);
 }
@@ -239,6 +227,7 @@ int prepare_memory()
 	    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");