Use freeit() everywhere

3 files changed, 46 insertions, 55 deletions

diff --git a/tests/catalog.c b/tests/catalog.c
index fbccfe5..7192135 100644
--- a/tests/catalog.c
+++ b/tests/catalog.c
@@ -1,6 +1,7 @@
 #include "../src/catalog.c"
 
 #include "../src/testing.h"
+#include "../src/util.h"
 #include "slurp.h"
 
 
@@ -103,9 +104,7 @@ test_s_print_msgs(void) {
 
 		assert(strcmp(expected, str) == 0);
 
-		free(str);
-		str = NULL;
-
+		freeit((void *)&str);
 		test_ok();
 	}
 	{
@@ -139,8 +138,7 @@ test_s_print_msgs(void) {
 
 		assert(strcmp(expected, str) == 0);
 
-		free(str);
-		str = NULL;
+		freeit((void *)&str);
 
 		test_ok();
 	}
@@ -258,8 +256,7 @@ test_s_print_msg(void) {
 
 		assert(strcmp(expected, str) == 0);
 
-		free(str);
-		str = NULL;
+		freeit((void *)&str);
 
 		test_ok();
 	}
diff --git a/tests/logerr.c b/tests/logerr.c
index 3dd700e..806f6d0 100644
--- a/tests/logerr.c
+++ b/tests/logerr.c
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include "../src/testing.h"
+#include "../src/util.h"
 #include "slurp.h"
 
 
@@ -48,8 +49,7 @@ test_vlogerr(void) {
 			"tests/logerr.c:test_vlogerr:100: \n";
 		assert(strcmp(expected, str) == 0);
 
-		free(str);
-		str = NULL;
+		freeit((void *)&str);
 
 		test_ok();
 	}
@@ -82,8 +82,7 @@ test_vlogerr(void) {
 			"tests/logerr.c:test_vlogerr:200: \n\n";
 		assert(strcmp(expected, str) == 0);
 
-		free(str);
-		str = NULL;
+		freeit((void *)&str);
 
 		test_ok();
 	}
@@ -116,8 +115,7 @@ test_vlogerr(void) {
 			"tests/logerr.c:test_vlogerr:300: some static string\n";
 		assert(strcmp(expected, str) == 0);
 
-		free(str);
-		str = NULL;
+		freeit((void *)&str);
 
 		test_ok();
 	}
@@ -150,8 +148,7 @@ test_vlogerr(void) {
 			"tests/logerr.c:test_vlogerr:400: fn(an-arg)\n";
 		assert(strcmp(expected, str) == 0);
 
-		free(str);
-		str = NULL;
+		freeit((void *)&str);
 
 		test_ok();
 	}
@@ -188,16 +185,15 @@ test_vlogerr(void) {
 			"int (123), string (another-str) and char (z)\n";
 		assert(strcmp(expected, str) == 0);
 
-		free(str);
-		str = NULL;
+		freeit((void *)&str);
 
 		test_ok();
 	}
 
 	rc = 0;
 out:
-	if (str) {
-		free(str);
+	if (str != NULL) {
+		freeit((void *)&str);
 	}
 	if (file) {
 		if (fclose(file)) {
diff --git a/tests/util.c b/tests/util.c
index bda7606..7b48568 100644
--- a/tests/util.c
+++ b/tests/util.c
@@ -19,6 +19,38 @@ test_EXIT_USAGE(void) {
 }
 
 static int
+test_freeit(void) {
+	int rc = -1;
+
+	test_start("freeit()");
+
+	const char *ptr = NULL;
+
+	{
+		testing("ptr is NULL afterwards");
+
+		ptr = malloc(1234U);
+		if (ptr == NULL) {
+			logerr("malloc(): %s", strerror(errno));
+			goto out;
+		}
+
+		assert(ptr != NULL);
+		freeit((void *)&ptr);
+		assert(ptr == NULL);
+
+		test_ok();
+	}
+
+	rc = 0;
+out:
+	if (ptr != NULL) {
+		freeit((void *)&ptr);
+	}
+	return rc;
+}
+
+static int
 test_slurp(void) {
 	int rc = -1;
 
@@ -55,10 +87,8 @@ test_slurp(void) {
 		assert(expected != NULL);
 		assert(strcmp(given, expected) == 0);
 
-		free(given);
-		given = NULL;
-		free(expected);
-		expected = NULL;
+		freeit((void *)&given);
+		freeit((void *)&expected);
 
 		test_ok();
 	}
@@ -74,38 +104,6 @@ out:
 	return rc;
 }
 
-static int
-test_freeit(void) {
-	int rc = -1;
-
-	test_start("freeit()");
-
-	const char *ptr = NULL;
-
-	{
-		testing("ptr is NULL afterwards");
-
-		ptr = malloc(1234U);
-		if (ptr == NULL) {
-			logerr("malloc(): %s", strerror(errno));
-			goto out;
-		}
-
-		assert(ptr != NULL);
-		freeit((void *)&ptr);
-		assert(ptr == NULL);
-
-		test_ok();
-	}
-
-	rc = 0;
-out:
-	if (ptr != NULL) {
-		freeit((void *)&ptr);
-	}
-	return rc;
-}
-
 
 int
 main(void) {