1 files changed, 34 insertions, 36 deletions

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) {