--- ./lib/logmsg/nvtable.c_orig	2025-03-03 03:22:50.296144162 -0500
+++ ./lib/logmsg/nvtable.c	2025-03-03 03:23:27.196589702 -0500
@@ -651,7 +651,7 @@
   NVTable *self = (NVTable *) ((gpointer *) user_data)[0];
   NVRegistry *registry = (NVRegistry *) ((gpointer *) user_data)[1];
   NVTableForeachFunc func = ((gpointer *) user_data)[2];
-  gpointer func_data = ((gpointer *) user_data)[3];
+  gpointer func_data1 = ((gpointer *) user_data)[3];
   const gchar *value;
   gssize value_len;
   NVType type;
@@ -660,7 +660,7 @@
     return FALSE;
 
   value = nv_table_resolve_entry(self, entry, &value_len, &type);
-  return func(handle, nv_registry_get_handle_name(registry, handle, NULL), value, value_len, type, func_data);
+  return func(handle, nv_registry_get_handle_name(registry, handle, NULL), value, value_len, type, func_data1);
 }
 
 gboolean
--- ./lib/stats/stats-registry.c_orig	2025-03-03 03:23:35.522476827 -0500
+++ ./lib/stats/stats-registry.c	2025-03-03 03:24:32.807544215 -0500
@@ -416,10 +416,10 @@
 {
   gpointer *args = (gpointer *) user_data;
   StatsForeachClusterFunc func = args[0];
-  gpointer func_data = args[1];
+  gpointer func_data1 = args[1];
   StatsCluster *sc = (StatsCluster *) value;
 
-  func(sc, func_data);
+  func(sc, func_data1);
 }
 
 static void
@@ -452,10 +452,10 @@
 {
   gpointer *args = (gpointer *) user_data;
   StatsForeachClusterRemoveFunc func = args[0];
-  gpointer func_data = args[1];
+  gpointer func_data1 = args[1];
   StatsCluster *sc = (StatsCluster *) value;
 
-  gboolean should_be_removed = func(sc, func_data) && stats_cluster_is_orphaned(sc);
+  gboolean should_be_removed = func(sc, func_data1) && stats_cluster_is_orphaned(sc);
   return should_be_removed;
 }
 
@@ -472,9 +472,9 @@
 {
   gpointer *args = (gpointer *) user_data;
   StatsForeachCounterFunc func = args[0];
-  gpointer func_data = args[1];
+  gpointer func_data1 = args[1];
 
-  stats_cluster_foreach_counter(sc, func, func_data);
+  stats_cluster_foreach_counter(sc, func, func_data1);
 }
 
 static void