Refactor: libcrmcommon: Rename pcmk__xe_set_guint to pcmk__xe_set_uint

We're no longer using the guint alias.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

daemons/execd/execd_commands.c

@@ -633,7 +633,7 @@ send_cmd_complete_notify(lrmd_cmd_t * cmd)
 
     pcmk__xe_set(notify, PCMK__XA_LRMD_ORIGIN, __func__);
     pcmk__xe_set_int(notify, PCMK__XA_LRMD_TIMEOUT, cmd->timeout);
-    pcmk__xe_set_guint(notify, PCMK__XA_LRMD_RSC_INTERVAL, cmd->interval_ms);
+    pcmk__xe_set_uint(notify, PCMK__XA_LRMD_RSC_INTERVAL, cmd->interval_ms);
     pcmk__xe_set_int(notify, PCMK__XA_LRMD_RSC_START_DELAY, cmd->start_delay);
     pcmk__xe_set_int(notify, PCMK__XA_LRMD_EXEC_RC, cmd->result.exit_status);
     pcmk__xe_set_int(notify, PCMK__XA_LRMD_EXEC_OP_STATUS,
@@ -1828,8 +1828,7 @@ add_recurring_op_xml(xmlNode *reply, lrmd_rsc_t *rsc)
 
         pcmk__xe_set(op_xml, PCMK__XA_LRMD_RSC_ACTION,
                      pcmk__s(cmd->real_action, cmd->action));
-        pcmk__xe_set_guint(op_xml, PCMK__XA_LRMD_RSC_INTERVAL,
-                           cmd->interval_ms);
+        pcmk__xe_set_uint(op_xml, PCMK__XA_LRMD_RSC_INTERVAL, cmd->interval_ms);
         pcmk__xe_set_int(op_xml, PCMK__XA_LRMD_TIMEOUT, cmd->timeout_orig);
     }
 }

include/crm/common/xml_element_internal.h

@@ -151,7 +151,7 @@ int pcmk__xe_get_flags(const xmlNode *xml, const char *name, uint32_t *dest,
                        uint32_t default_value);
 
 int pcmk__xe_get_uint(const xmlNode *xml, const char *attr, unsigned int *dest);
-void pcmk__xe_set_guint(xmlNode *xml, const char *attr, unsigned int value);
+void pcmk__xe_set_uint(xmlNode *xml, const char *attr, unsigned int value);
 
 int pcmk__xe_get_int(const xmlNode *xml, const char *name, int *dest);
 void pcmk__xe_set_int(xmlNode *xml, const char *attr, int value);

lib/common/xml_element.c

@@ -1180,7 +1180,7 @@ pcmk__xe_get_uint(const xmlNode *xml, const char *attr, unsigned int *dest)
  * \param[in]     value  Attribute value to set
  */
 void
-pcmk__xe_set_guint(xmlNode *xml, const char *attr, unsigned int value)
+pcmk__xe_set_uint(xmlNode *xml, const char *attr, unsigned int value)
 {
     char *value_s = NULL;
 

lib/lrmd/lrmd_client.c

@@ -2014,7 +2014,7 @@ lrmd_api_exec(lrmd_t *lrmd, const char *rsc_id, const char *action,
     pcmk__xe_set(data, PCMK__XA_LRMD_RSC_ID, rsc_id);
     pcmk__xe_set(data, PCMK__XA_LRMD_RSC_ACTION, action);
     pcmk__xe_set(data, PCMK__XA_LRMD_RSC_USERDATA_STR, userdata);
-    pcmk__xe_set_guint(data, PCMK__XA_LRMD_RSC_INTERVAL, interval_ms);
+    pcmk__xe_set_uint(data, PCMK__XA_LRMD_RSC_INTERVAL, interval_ms);
     pcmk__xe_set_int(data, PCMK__XA_LRMD_TIMEOUT, timeout);
     pcmk__xe_set_int(data, PCMK__XA_LRMD_RSC_START_DELAY, start_delay);
 
@@ -2066,7 +2066,7 @@ lrmd_api_cancel(lrmd_t *lrmd, const char *rsc_id, const char *action,
     pcmk__xe_set(data, PCMK__XA_LRMD_ORIGIN, __func__);
     pcmk__xe_set(data, PCMK__XA_LRMD_RSC_ACTION, action);
     pcmk__xe_set(data, PCMK__XA_LRMD_RSC_ID, rsc_id);
-    pcmk__xe_set_guint(data, PCMK__XA_LRMD_RSC_INTERVAL, interval_ms);
+    pcmk__xe_set_uint(data, PCMK__XA_LRMD_RSC_INTERVAL, interval_ms);
     rc = lrmd_send_command(lrmd, LRMD_OP_RSC_CANCEL, data, NULL, 0, 0, true);
     pcmk__xml_free(data);
     return rc;

lib/pacemaker/pcmk_sched_actions.c

@@ -1256,7 +1256,7 @@ pcmk__create_history_xml(xmlNode *parent, lrmd_event_data_t *op,
     pcmk__xe_set_int(xml_op, PCMK__XA_CALL_ID, op->call_id);
     pcmk__xe_set_int(xml_op, PCMK__XA_RC_CODE, op->rc);
     pcmk__xe_set_int(xml_op, PCMK__XA_OP_STATUS, op->op_status);
-    pcmk__xe_set_guint(xml_op, PCMK_META_INTERVAL, op->interval_ms);
+    pcmk__xe_set_uint(xml_op, PCMK_META_INTERVAL, op->interval_ms);
 
     if ((op->t_run > 0) || (op->t_rcchange > 0) || (op->exec_time > 0)
         || (op->queue_time > 0)) {