From 43b171c7145a7ec93e9430ee377831853ef90ffe Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Sat, 11 Nov 2023 08:05:52 -0500
Subject: [PATCH] MT#55283 replace free_gvbuf via g_autoptr

Change-Id: If2ce7fb274478a0c044c00ded1404c31258ed0c7
---
 daemon/main.c  | 18 +++++++++---------
 daemon/redis.c |  2 +-
 lib/auxlib.c   |  6 +-----
 lib/auxlib.h   |  5 ++---
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/daemon/main.c b/daemon/main.c
index 7cc78f9e3..8b8b65c4a 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -448,16 +448,16 @@ static void release_listeners(GQueue *q) {
 
 
 static void options(int *argc, char ***argv) {
-	AUTO_CLEANUP_GVBUF(if_a);
-	AUTO_CLEANUP_GVBUF(ks_a);
+	g_autoptr(char_p) if_a = NULL;
+	g_autoptr(char_p) ks_a = NULL;
 	unsigned long uint_keyspace_db;
 	str str_keyspace_db;
 	char **iter;
-	AUTO_CLEANUP_GVBUF(listenps);
-	AUTO_CLEANUP_GVBUF(listenudps);
-	AUTO_CLEANUP_GVBUF(listenngs);
-	AUTO_CLEANUP_GVBUF(listenngtcps);
-	AUTO_CLEANUP_GVBUF(listencli);
+	g_autoptr(char_p) listenps = NULL;
+	g_autoptr(char_p) listenudps = NULL;
+	g_autoptr(char_p) listenngs = NULL;
+	g_autoptr(char_p) listenngtcps = NULL;
+	g_autoptr(char_p) listencli = NULL;
 	g_autoptr(char) graphitep = NULL;
 	g_autoptr(char) graphite_prefix_s = NULL;
 	g_autoptr(char) redisps = NULL;
@@ -477,8 +477,8 @@ static void options(int *argc, char ***argv) {
 	g_autoptr(char) endpoint_learning = NULL;
 	g_autoptr(char) dtls_sig = NULL;
 	double silence_detect = 0;
-	AUTO_CLEANUP_GVBUF(cn_payload);
-	AUTO_CLEANUP_GVBUF(dtx_cn_params);
+	g_autoptr(char_p) cn_payload = NULL;
+	g_autoptr(char_p) dtx_cn_params = NULL;
 	bool debug_srtp = false;
 	g_autoptr(char) amr_dtx = NULL;
 #ifdef HAVE_MQTT
diff --git a/daemon/redis.c b/daemon/redis.c
index d5b5a0036..5dcbfd197 100644
--- a/daemon/redis.c
+++ b/daemon/redis.c
@@ -1031,7 +1031,7 @@ static int json_get_hash(struct redis_hash *out,
 	static unsigned int MAXKEYLENGTH = 512;
 	char key_concatted[MAXKEYLENGTH];
 	int rc=0;
-	__attribute__((unused)) AUTO_CLEANUP_GVBUF(orig_members);
+	g_autoptr(char_p) orig_members = NULL;
 
 	if (id == -1) {
 		rc = snprintf(key_concatted, MAXKEYLENGTH, "%s",key);
diff --git a/lib/auxlib.c b/lib/auxlib.c
index 05fc6eab0..a2e011d02 100644
--- a/lib/auxlib.c
+++ b/lib/auxlib.c
@@ -179,7 +179,7 @@ void config_load(int *argc, char ***argv, GOptionEntry *app_entries, const char
 	g_autoptr(char) use_section = NULL;
 	const char *use_config;
 	int fatal = 0;
-	AUTO_CLEANUP(char **saved_argv, free_gvbuf) = g_strdupv(*argv);
+	g_autoptr(char_p) saved_argv = g_strdupv(*argv);
 	int saved_argc = *argc;
 
 	rtpe_common_config_ptr = cconfig;
@@ -465,10 +465,6 @@ int timeval_cmp_ptr(const void *a, const void *b) {
 	return 0;
 }
 
-void free_gvbuf(char ***p) {
-	g_strfreev(*p);
-}
-
 int g_tree_find_first_cmp(void *k, void *v, void *d) {
 	void **p = d;
 	GEqualFunc f = p[1];
diff --git a/lib/auxlib.h b/lib/auxlib.h
index b53c12312..9f469a303 100644
--- a/lib/auxlib.h
+++ b/lib/auxlib.h
@@ -78,13 +78,12 @@ int num_cpu_cores(int);
 
 #define UINT64F			"%" G_GUINT64_FORMAT
 
-void free_gvbuf(char ***);
-
 #define AUTO_CLEANUP(decl, func)		decl __attribute__ ((__cleanup__(func)))
 #define AUTO_CLEANUP_INIT(decl, func, val)	AUTO_CLEANUP(decl, func) = val
 #define AUTO_CLEANUP_NULL(decl, func)		AUTO_CLEANUP_INIT(decl, func, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(char, g_free)
-#define AUTO_CLEANUP_GVBUF(var)			AUTO_CLEANUP_NULL(char **var, free_gvbuf)
+typedef char *char_p;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(char_p, g_strfreev)
 
 
 /*** STRING HELPERS ***/