Merge pull request #4093 from nrwahl2/nrwahl2-gint

Replace some GLib type aliases with native C types

Author: clumens

daemons/attrd/attrd_alerts.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2025 the Pacemaker project contributors
+ * Copyright 2015-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -103,7 +103,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
 }
 
 gboolean
-attrd_read_options(gpointer user_data)
+attrd_read_options(void *user_data)
 {
     int call_id;
 

daemons/attrd/attrd_attributes.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the Pacemaker project contributors
+ * Copyright 2013-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -172,9 +172,9 @@ attrd_clear_value_seen(void)
     attribute_value_t *v = NULL;
 
     g_hash_table_iter_init(&aIter, attributes);
-    while (g_hash_table_iter_next(&aIter, NULL, (gpointer *) & a)) {
+    while (g_hash_table_iter_next(&aIter, NULL, (void **) &a)) {
         g_hash_table_iter_init(&vIter, a->values);
-        while (g_hash_table_iter_next(&vIter, NULL, (gpointer *) & v)) {
+        while (g_hash_table_iter_next(&vIter, NULL, (void **) &v)) {
             attrd_clear_value_flags(v, attrd_value_from_peer);
         }
     }

daemons/attrd/attrd_cib.c

@@ -27,7 +27,7 @@ static int last_cib_op_done = 0;
 static void write_attribute(attribute_t *a, bool ignore_delay);
 
 static void
-attrd_cib_destroy_cb(gpointer user_data)
+attrd_cib_destroy_cb(void *user_data)
 {
     cib_t *cib = user_data;
 
@@ -235,7 +235,7 @@ attrd_cib_init(void)
 }
 
 static gboolean
-attribute_timer_cb(gpointer data)
+attribute_timer_cb(void *data)
 {
     attribute_t *a = data;
     pcmk__trace("Dampen interval expired for %s", a->id);
@@ -287,7 +287,7 @@ attrd_cib_callback(xmlNode *msg, int call_id, int rc, xmlNode *output, void *use
                call_id, a->id, pcmk_strerror(rc), rc);
 
     g_hash_table_iter_init(&iter, a->values);
-    while (g_hash_table_iter_next(&iter, (gpointer *) & peer, (gpointer *) & v)) {
+    while (g_hash_table_iter_next(&iter, (void **) &peer, (void **) &v)) {
         if (rc == pcmk_ok) {
             pcmk__info("* Wrote %s[%s]=%s", a->id, peer,
                        pcmk__s(v->requested, "(unset)"));
@@ -447,7 +447,7 @@ send_alert_attributes_value(attribute_t *a, GHashTable *t)
 
     g_hash_table_iter_init(&vIter, t);
 
-    while (g_hash_table_iter_next(&vIter, NULL, (gpointer *) & at)) {
+    while (g_hash_table_iter_next(&vIter, NULL, (void **) &at)) {
         const char *node_xml_id = attrd_get_node_xml_id(at->nodename);
         const char *failed_s = NULL;
 
@@ -572,7 +572,7 @@ write_attribute(attribute_t *a, bool ignore_delay)
 
     /* Iterate over each peer value of this attribute */
     g_hash_table_iter_init(&iter, a->values);
-    while (g_hash_table_iter_next(&iter, NULL, (gpointer *) &v)) {
+    while (g_hash_table_iter_next(&iter, NULL, (void **) &v)) {
         const char *node_xml_id = NULL;
         const char *prev_xml_id = NULL;
 
@@ -692,7 +692,7 @@ attrd_write_attributes(uint32_t options)
     pcmk__debug("Writing out %s attributes",
                 pcmk__is_set(options, attrd_write_all)? "all" : "changed");
     g_hash_table_iter_init(&iter, attributes);
-    while (g_hash_table_iter_next(&iter, NULL, (gpointer *) & a)) {
+    while (g_hash_table_iter_next(&iter, NULL, (void **) &a)) {
         if (!pcmk__is_set(options, attrd_write_all)
             && pcmk__is_set(a->flags, attrd_attr_node_unknown)) {
             // Try writing this attribute again, in case peer ID was learned

daemons/attrd/attrd_corosync.c

@@ -177,7 +177,7 @@ attrd_cpg_dispatch(cpg_handle_t handle, const struct cpg_name *group_name,
  * \param[in] unused Unused
  */
 static void
-attrd_cpg_destroy(gpointer unused)
+attrd_cpg_destroy(void *unused)
 {
     if (attrd_shutting_down()) {
         pcmk__info("Disconnected from Corosync process group");
@@ -433,7 +433,7 @@ attrd_peer_update_one(const pcmk__node_status_t *peer, xmlNode *xml,
         pcmk__xe_remove_attr(xml, PCMK__XA_ATTR_HOST_ID);
         g_hash_table_iter_init(&vIter, a->values);
 
-        while (g_hash_table_iter_next(&vIter, (gpointer *) & host, NULL)) {
+        while (g_hash_table_iter_next(&vIter, (void **) &host, NULL)) {
             update_attr_on_host(a, peer, xml, attr, value, host, filter);
         }
 
@@ -460,10 +460,10 @@ broadcast_unseen_local_values(void)
     xmlNode *sync = NULL;
 
     g_hash_table_iter_init(&aIter, attributes);
-    while (g_hash_table_iter_next(&aIter, NULL, (gpointer *) & a)) {
+    while (g_hash_table_iter_next(&aIter, NULL, (void **) &a)) {
 
         g_hash_table_iter_init(&vIter, a->values);
-        while (g_hash_table_iter_next(&vIter, NULL, (gpointer *) & v)) {
+        while (g_hash_table_iter_next(&vIter, NULL, (void **) &v)) {
 
             if (!pcmk__is_set(v->flags, attrd_value_from_peer)
                 && pcmk__str_eq(v->nodename, attrd_cluster->priv->node_name,
@@ -527,7 +527,7 @@ attrd_peer_clear_failure(pcmk__request_t *request)
     const char *host = pcmk__xe_get(xml, PCMK__XA_ATTR_HOST);
     const char *op = pcmk__xe_get(xml, PCMK__XA_ATTR_CLEAR_OPERATION);
     const char *interval_spec = pcmk__xe_get(xml, PCMK__XA_ATTR_CLEAR_INTERVAL);
-    guint interval_ms = 0U;
+    unsigned int interval_ms = 0;
     char *attr = NULL;
     GHashTableIter iter;
     regex_t regex;
@@ -550,7 +550,7 @@ attrd_peer_clear_failure(pcmk__request_t *request)
     pcmk__xe_remove_attr(xml, PCMK__XA_ATTR_VALUE);
 
     g_hash_table_iter_init(&iter, attributes);
-    while (g_hash_table_iter_next(&iter, (gpointer *) &attr, NULL)) {
+    while (g_hash_table_iter_next(&iter, (void **) &attr, NULL)) {
         if (regexec(&regex, attr, 0, NULL, 0) == 0) {
             pcmk__trace("Matched %s when clearing %s", attr,
                         pcmk__s(rsc, "all resources"));
@@ -616,7 +616,7 @@ attrd_erase_removed_peer_attributes(void)
     }
 
     g_hash_table_iter_init(&iter, removed_peers);
-    while (g_hash_table_iter_next(&iter, (gpointer *) &host, NULL)) {
+    while (g_hash_table_iter_next(&iter, (void **) &host, NULL)) {
         attrd_cib_erase_transient_attrs(host);
         g_hash_table_iter_remove(&iter);
     }
@@ -642,7 +642,7 @@ attrd_peer_remove(const char *host, bool uncache, const char *source)
                  host, source, (uncache? "and" : "without"));
 
     g_hash_table_iter_init(&aIter, attributes);
-    while (g_hash_table_iter_next(&aIter, NULL, (gpointer *) & a)) {
+    while (g_hash_table_iter_next(&aIter, NULL, (void **) &a)) {
         if(g_hash_table_remove(a->values, host)) {
             pcmk__debug("Removed %s[%s] for peer %s", a->id, host, source);
         }
@@ -702,9 +702,9 @@ attrd_peer_sync(pcmk__node_status_t *peer)
     pcmk__xe_set(sync, PCMK_XA_TASK, PCMK__ATTRD_CMD_SYNC_RESPONSE);
 
     g_hash_table_iter_init(&aIter, attributes);
-    while (g_hash_table_iter_next(&aIter, NULL, (gpointer *) & a)) {
+    while (g_hash_table_iter_next(&aIter, NULL, (void **) &a)) {
         g_hash_table_iter_init(&vIter, a->values);
-        while (g_hash_table_iter_next(&vIter, NULL, (gpointer *) & v)) {
+        while (g_hash_table_iter_next(&vIter, NULL, (void **) &v)) {
             pcmk__debug("Syncing %s[%s]='%s' to %s", a->id, v->nodename,
                         readable_value(v), readable_peer(peer));
             attrd_add_value_xml(sync, a, v, false);

daemons/attrd/attrd_ipc.c

@@ -73,7 +73,7 @@ static xmlNode *build_query_reply(const char *attr, const char *host)
             GHashTableIter iter;
 
             g_hash_table_iter_init(&iter, a->values);
-            while (g_hash_table_iter_next(&iter, NULL, (gpointer *) &v)) {
+            while (g_hash_table_iter_next(&iter, NULL, (void **) &v)) {
                 host_value = pcmk__xe_create(reply, PCMK_XE_NODE);
                 pcmk__xe_set(host_value, PCMK__XA_ATTR_HOST, v->nodename);
                 pcmk__xe_set(host_value, PCMK__XA_ATTR_VALUE, v->current);
@@ -114,7 +114,7 @@ attrd_client_clear_failure(pcmk__request_t *request)
             pattern = pcmk__assert_asprintf(ATTRD_RE_CLEAR_ONE, rsc);
 
         } else {
-            guint interval_ms = 0U;
+            unsigned int interval_ms = 0;
 
             pcmk_parse_interval_spec(interval_spec, &interval_ms);
             pattern = pcmk__assert_asprintf(ATTRD_RE_CLEAR_OP, rsc, op,
@@ -257,7 +257,7 @@ expand_regexes(xmlNode *xml, const char *attr, const char *value, const char *re
         }
 
         g_hash_table_iter_init(&aIter, attributes);
-        while (g_hash_table_iter_next(&aIter, (gpointer *) & attr, NULL)) {
+        while (g_hash_table_iter_next(&aIter, (void **) &attr, NULL)) {
             int status = regexec(&r_patt, attr, 0, NULL, 0);
 
             if (status == 0) {

daemons/attrd/attrd_sync.c

@@ -98,7 +98,7 @@ next_key(void)
 }
 
 static void
-free_waitlist_node(gpointer data)
+free_waitlist_node(void *data)
 {
     struct waitlist_node *wl = (struct waitlist_node *) data;
 
@@ -196,7 +196,7 @@ void
 attrd_remove_client_from_waitlist(pcmk__client_t *client)
 {
     GHashTableIter iter;
-    gpointer value;
+    void *value = NULL;
 
     if (waitlist == NULL) {
         return;
@@ -231,7 +231,7 @@ void
 attrd_ack_waitlist_clients(enum attrd_sync_point sync_point, const xmlNode *xml)
 {
     int callid;
-    gpointer value;
+    void *value = NULL;
 
     if (waitlist == NULL) {
         return;
@@ -337,7 +337,7 @@ attrd_request_has_sync_point(xmlNode *xml)
 }
 
 static void
-free_action(gpointer data)
+free_action(void *data)
 {
     struct confirmation_action *action = (struct confirmation_action *) data;
     g_list_free_full(action->respondents, free);
@@ -353,12 +353,12 @@ free_action(gpointer data)
  * cleared of things that didn't complete.
  */
 static gboolean
-confirmation_timeout_cb(gpointer data)
+confirmation_timeout_cb(void *data)
 {
     struct confirmation_action *action = (struct confirmation_action *) data;
 
     GHashTableIter iter;
-    gpointer value;
+    void *value = NULL;
 
     if (expected_confirmations == NULL) {
         return G_SOURCE_REMOVE;
@@ -431,7 +431,7 @@ void
 attrd_do_not_wait_for_client(pcmk__client_t *client)
 {
     GHashTableIter iter;
-    gpointer value;
+    void *value = NULL;
 
     if (expected_confirmations == NULL) {
         return;
@@ -476,7 +476,8 @@ attrd_expect_confirmations(pcmk__request_t *request, attrd_confirmation_action_f
 {
     struct confirmation_action *action = NULL;
     GHashTableIter iter;
-    gpointer host, ver;
+    void *host = NULL;
+    void *ver = NULL;
     GList *respondents = NULL;
     int callid;
 

daemons/attrd/attrd_utils.c

@@ -168,7 +168,7 @@ attrd_expand_value(const char *value, const char *old_value)
  */
 int
 attrd_failure_regex(regex_t *regex, const char *rsc, const char *op,
-                    guint interval_ms)
+                    unsigned int interval_ms)
 {
     char *pattern = NULL;
     int rc;
@@ -193,7 +193,7 @@ attrd_failure_regex(regex_t *regex, const char *rsc, const char *op,
 }
 
 void
-attrd_free_attribute_value(gpointer data)
+attrd_free_attribute_value(void *data)
 {
     attribute_value_t *v = data;
 
@@ -204,7 +204,7 @@ attrd_free_attribute_value(gpointer data)
 }
 
 void
-attrd_free_attribute(gpointer data)
+attrd_free_attribute(void *data)
 {
     attribute_t *a = data;
     if(a) {

daemons/attrd/pacemaker-attrd.h

@@ -89,7 +89,7 @@ int attrd_expand_value(const char *value, const char *old_value);
 #define ATTRD_RE_CLEAR_OP ATTRD_RE_CLEAR_ALL "%s#%s_%u$"
 
 int attrd_failure_regex(regex_t *regex, const char *rsc, const char *op,
-                        guint interval_ms);
+                        unsigned int interval_ms);
 
 extern cib_t *the_cib;
 extern crm_exit_t attrd_exit_status;
@@ -100,7 +100,7 @@ extern lrmd_t *the_lrmd;
 extern crm_trigger_t *attrd_config_read;
 
 void attrd_lrmd_disconnect(void);
-gboolean attrd_read_options(gpointer user_data);
+gboolean attrd_read_options(void *user_data);
 int attrd_send_attribute_alert(const char *node, const char *node_xml_id,
                                const char *attr, const char *value);
 
@@ -216,8 +216,8 @@ gboolean attrd_send_message(const pcmk__node_status_t *node, xmlNode *data,
 xmlNode *attrd_add_value_xml(xmlNode *parent, const attribute_t *a,
                              const attribute_value_t *v, bool force_write);
 void attrd_clear_value_seen(void);
-void attrd_free_attribute(gpointer data);
-void attrd_free_attribute_value(gpointer data);
+void attrd_free_attribute(void *data);
+void attrd_free_attribute_value(void *data);
 attribute_t *attrd_populate_attribute(xmlNode *xml, const char *attr);
 char *attrd_set_id(const attribute_t *attr, const char *node_state_id);
 char *attrd_nvpair_id(const attribute_t *attr, const char *node_state_id);

daemons/based/based_callbacks.c

@@ -18,7 +18,7 @@
 #include <time.h>                   // time_t
 #include <unistd.h>                 // close
 
-#include <glib.h>                   // gboolean, gpointer, g_*, etc.
+#include <glib.h>                   // gboolean, g_*, etc.
 #include <libxml/tree.h>            // xmlNode
 #include <qb/qbipcs.h>              // qb_ipcs_connection_t
 #include <qb/qblog.h>               // LOG_TRACE
@@ -178,7 +178,7 @@ do_local_notify(const xmlNode *xml, const char *client_id, bool sync_reply,
  *       is received.
  */
 static gboolean
-digest_timer_cb(gpointer data)
+digest_timer_cb(void *data)
 {
     xmlNode *ping = NULL;
 
@@ -892,7 +892,7 @@ based_peer_callback(xmlNode *msg, void *private_data)
 }
 
 static gboolean
-cib_force_exit(gpointer data)
+cib_force_exit(void *data)
 {
     pcmk__notice("Exiting immediately after %s without shutdown acknowledgment",
                  pcmk__readable_interval(EXIT_ESCALATION_MS));

daemons/based/based_io.c

@@ -87,7 +87,7 @@ write_cib_cb(mainloop_child_t *child, int core, int signo, int exit_code)
  * \param[in] user_data  Ignored
  */
 static int
-write_cib_async(gpointer user_data)
+write_cib_async(void *user_data)
 {
     int rc = pcmk_rc_ok;
     pid_t pid = 0;