X-Git-Url: http://git.asbjorn.biz/?p=debian%2Fdhcpd-pools.git;a=blobdiff_plain;f=src%2Fother.c;h=21a763ac787cd27e28d6f8cfc64266ba4c066c47;hp=4ad6b012f9ff7eb00faaef0cedbaa5684c708381;hb=b492802dfa7bf928bbafe74194ca4f154c70f743;hpb=17429ef85bfb4bdf51f4a659443fe4c31c972928

diff --git a/src/other.c b/src/other.c
index 4ad6b01..21a763a 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,6 +49,27 @@ 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 */
+char *safe_strdup(const char *str)
+{
+	char *ret = strdup(str);
+
+	if (!ret && str)
+		err(EXIT_FAILURE, "cannot duplicate string");
+	return ret;
+}
+
 void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
 {
 	unsigned int i = num_ranges - 1, j;
@@ -66,9 +86,7 @@ void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
 void clean_up(void)
 {
 	int ret;
-	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) {
@@ -78,10 +96,13 @@ void clean_up(void)
 	if (errno || ret) {
 		warn("clean_up: stderr");
 	}
+
 	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);
 }
@@ -97,6 +118,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)