src/util.c: Add freeit()

3 files changed, 46 insertions, 0 deletions

diff --git a/src/util.c b/src/util.c
index 65269ac..33307a6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -73,3 +73,9 @@ out:
 	}
 	return rc;
 }
+
+void
+freeit(const void **const ptr) {
+	free((void *)*ptr);
+	*ptr = NULL;
+}
diff --git a/src/util.h b/src/util.h
index 8574b35..ca6ba3f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -3,3 +3,6 @@ NULL_TERMINATOR;
 
 int
 slurp(const char *const filename, char **out);
+
+void
+freeit(const void **const ptr);
diff --git a/tests/util.c b/tests/util.c
index f4e3d0c..ad43012 100644
--- a/tests/util.c
+++ b/tests/util.c
@@ -62,6 +62,38 @@ 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\n", 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) {
@@ -72,6 +104,11 @@ main(void) {
 		goto out;
 	}
 
+	if (test_freeit()) {
+		logerr("test_freeit();\n");
+		goto out;
+	}
+
 	rc = 0;
 out:
 	return !!rc;