X-Git-Url: http://git.asbjorn.biz/?p=debian%2Fdhcpd-pools.git;a=blobdiff_plain;f=src%2Fother.c;h=4a9730b9aa7f0581ef82cffd0c3f0f5e844023c7;hp=60406e5d82688cbad68bac4edca0a33e0c7d1cf8;hb=HEAD;hpb=171ff1d7045de1059556f674470aa87a853563f0

diff --git a/src/other.c b/src/other.c
index 60406e5..4a9730b 100644
--- a/src/other.c
+++ b/src/other.c
@@ -41,7 +41,6 @@ extern char *malloc();
 void *safe_malloc(const size_t size)
 {
 	void *ret = malloc(size);
-
 	if (ret == NULL) {
 		err(EXIT_FAILURE,
 		    "safe_malloc: cannot allocate %lu bytes: ", size);
@@ -50,8 +49,19 @@ void *safe_malloc(const size_t size)
 	return ret;
 }
 
+/* Simple memory reallocation wrapper */
+void *safe_realloc(void *ptr, const size_t size)
+{
+	void *ret = realloc(ptr, size);
+
+	if (!ret && size)
+		err(EXIT_FAILURE,
+		    "safe_realloc: cannot allocate %zu bytes", size);
+	return ret;
+}
+
 /* Simple strdup wrapper */
-inline char *safe_strdup(const char *str)
+char *safe_strdup(const char *str)
 {
 	char *ret = strdup(str);
 
@@ -75,26 +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;
 
-	if (errno) {
-		warn("clean_up: errno (%d) set but not checked in correct place.\nif this is repeatable send strace output as a bug report", errno);
-	}
 	/* 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(shared_net_names);
+	free(leases);
+	free(touches);
 	free(shared_networks);
 }
 
@@ -109,6 +115,7 @@ void print_version(void)
 		"This is free software: you are free to change and redistribute it.\n");
 	fprintf(stdout,
 		"There is NO WARRANTY, to the extent permitted by law.\n");
+	exit(EXIT_SUCCESS);
 }
 
 void usage(int status)