Refactor: various: Use bool in pcmk__rsc_methods_t:state()

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

include/crm/common/resources_internal.h

@@ -219,11 +219,12 @@ typedef struct {
      * \brief Get resource's current or assigned role
      *
      * \param[in] rsc      Resource to check
-     * \param[in] current  If TRUE, check current role, otherwise assigned role
+     * \param[in] current  If \c true, check current role; otherwise, check
+     *                     assigned role
      *
      * \return Current or assigned role of \p rsc
      */
-    enum rsc_role_e (*state)(const pcmk_resource_t *rsc, gboolean current);
+    enum rsc_role_e (*state)(const pcmk_resource_t *rsc, bool current);
 
     /*!
      * \internal

include/crm/pengine/internal.h

@@ -111,14 +111,11 @@ void group_free(pcmk_resource_t *rsc);
 void clone_free(pcmk_resource_t *rsc);
 void pe__free_bundle(pcmk_resource_t *rsc);
 
-enum rsc_role_e native_resource_state(const pcmk_resource_t *rsc,
-                                      gboolean current);
-enum rsc_role_e group_resource_state(const pcmk_resource_t *rsc,
-                                     gboolean current);
-enum rsc_role_e clone_resource_state(const pcmk_resource_t *rsc,
-                                     gboolean current);
+enum rsc_role_e native_resource_state(const pcmk_resource_t *rsc, bool current);
+enum rsc_role_e group_resource_state(const pcmk_resource_t *rsc, bool current);
+enum rsc_role_e clone_resource_state(const pcmk_resource_t *rsc, bool current);
 enum rsc_role_e pe__bundle_resource_state(const pcmk_resource_t *rsc,
-                                          gboolean current);
+                                          bool current);
 
 void pe__count_common(pcmk_resource_t *rsc);
 void pe__count_bundle(pcmk_resource_t *rsc);

lib/pacemaker/pcmk_sched_actions.c

@@ -9,6 +9,7 @@
 
 #include <crm_internal.h>
 
+#include <stdbool.h>                        // bool, true, false
 #include <stdio.h>
 #include <sys/param.h>
 #include <glib.h>
@@ -734,7 +735,7 @@ handle_asymmetric_ordering(const pcmk_action_t *first, pcmk_action_t *then)
     if (pcmk_is_set(then->flags, pcmk__action_optional)) {
         enum rsc_role_e then_rsc_role;
 
-        then_rsc_role = then->rsc->priv->fns->state(then->rsc, TRUE);
+        then_rsc_role = then->rsc->priv->fns->state(then->rsc, true);
 
         if ((then_rsc_role == pcmk_role_stopped)
             && pcmk__str_eq(then->task, PCMK_ACTION_STOP, pcmk__str_none)) {

lib/pacemaker/pcmk_sched_ordering.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2024 the Pacemaker project contributors
+ * Copyright 2004-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -10,7 +10,7 @@
 #include <crm_internal.h>
 
 #include <inttypes.h>               // PRIx32
-#include <stdbool.h>
+#include <stdbool.h>                // bool, true, false
 #include <glib.h>
 
 #include <crm/crm.h>
@@ -1312,7 +1312,7 @@ rsc_order_first(pcmk_resource_t *first_rsc, pcmk__action_relation_t *order)
         parse_op_key(order->task1, NULL, &op_type, &interval_ms);
         key = pcmk__op_key(first_rsc->id, op_type, interval_ms);
 
-        first_role = first_rsc->priv->fns->state(first_rsc, TRUE);
+        first_role = first_rsc->priv->fns->state(first_rsc, true);
         if ((first_role == pcmk_role_stopped)
             && pcmk__str_eq(op_type, PCMK_ACTION_STOP, pcmk__str_none)) {
             free(key);

lib/pacemaker/pcmk_sched_promotable.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2024 the Pacemaker project contributors
+ * Copyright 2004-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -9,6 +9,8 @@
 
 #include <crm_internal.h>
 
+#include <stdbool.h>                // bool, true, false
+
 #include <crm/common/xml.h>
 #include <pacemaker-internal.h>
 
@@ -190,7 +192,7 @@ node_to_be_promoted_on(const pcmk_resource_t *rsc)
         return NULL;
 
     } else if (!pcmk_is_set(rsc->flags, pcmk__rsc_managed)) {
-        if (rsc->priv->fns->state(rsc, TRUE) == pcmk_role_promoted) {
+        if (rsc->priv->fns->state(rsc, true) == pcmk_role_promoted) {
             crm_notice("Unmanaged instance %s will be left promoted on %s",
                        rsc->id, pcmk__node_name(node));
         } else {
@@ -284,8 +286,8 @@ cmp_promotable_instance(gconstpointer a, gconstpointer b)
     }
 
     // If those are the same, prefer instance whose current role is higher
-    role1 = rsc1->priv->fns->state(rsc1, TRUE);
-    role2 = rsc2->priv->fns->state(rsc2, TRUE);
+    role1 = rsc1->priv->fns->state(rsc1, true);
+    role2 = rsc2->priv->fns->state(rsc2, true);
     if (role1 > role2) {
         pcmk__rsc_trace(rsc1,
                         "%s has higher promotion priority than %s "
@@ -951,7 +953,7 @@ set_instance_priority(gpointer data, gpointer user_data)
     pcmk__rsc_trace(clone, "Assigning priority for %s: %s", instance->id,
                     pcmk_role_text(instance->priv->next_role));
 
-    if (instance->priv->fns->state(instance, TRUE) == pcmk_role_started) {
+    if (instance->priv->fns->state(instance, true) == pcmk_role_started) {
         set_current_role_unpromoted(instance, NULL);
     }
 
@@ -967,7 +969,7 @@ set_instance_priority(gpointer data, gpointer user_data)
         return;
     }
 
-    next_role = instance->priv->fns->state(instance, FALSE);
+    next_role = instance->priv->fns->state(instance, false);
     switch (next_role) {
         case pcmk_role_started:
         case pcmk_role_unknown:
@@ -1283,7 +1285,7 @@ pcmk__update_dependent_with_promotable(const pcmk_resource_t *primary,
             continue;
         }
         if (instance->priv->fns->state(instance,
-                                       FALSE) == colocation->primary_role) {
+                                       false) == colocation->primary_role) {
             update_dependent_allowed_nodes(dependent, primary, node,
                                            colocation);
             affected_nodes = g_list_prepend(affected_nodes, node);

lib/pengine/bundle.c

@@ -1880,7 +1880,7 @@ pe__free_bundle(pcmk_resource_t *rsc)
 }
 
 enum rsc_role_e
-pe__bundle_resource_state(const pcmk_resource_t *rsc, gboolean current)
+pe__bundle_resource_state(const pcmk_resource_t *rsc, bool current)
 {
     enum rsc_role_e container_role = pcmk_role_unknown;
     return container_role;

lib/pengine/clone.c

@@ -950,7 +950,7 @@ clone_free(pcmk_resource_t * rsc)
 }
 
 enum rsc_role_e
-clone_resource_state(const pcmk_resource_t * rsc, gboolean current)
+clone_resource_state(const pcmk_resource_t *rsc, bool current)
 {
     enum rsc_role_e clone_role = pcmk_role_unknown;
 

lib/pengine/group.c

@@ -402,7 +402,7 @@ group_free(pcmk_resource_t * rsc)
 }
 
 enum rsc_role_e
-group_resource_state(const pcmk_resource_t * rsc, gboolean current)
+group_resource_state(const pcmk_resource_t *rsc, bool current)
 {
     enum rsc_role_e group_role = pcmk_role_unknown;
 

lib/pengine/native.c

@@ -871,7 +871,7 @@ native_free(pcmk_resource_t * rsc)
 }
 
 enum rsc_role_e
-native_resource_state(const pcmk_resource_t * rsc, gboolean current)
+native_resource_state(const pcmk_resource_t *rsc, bool current)
 {
     enum rsc_role_e role = rsc->priv->next_role;
 

tools/crm_resource.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2024 the Pacemaker project contributors
+ * Copyright 2004-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -18,7 +18,8 @@
 #include <pacemaker-internal.h>
 
 #include <sys/param.h>
-#include <stdint.h>         // uint32_t
+#include <stdbool.h>                        // bool, true, false
+#include <stdint.h>                         // uint32_t
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -852,7 +853,7 @@ ban_or_move(pcmk__output_t *out, pcmk_resource_t *rsc,
         current = NULL;
         for (iter = rsc->priv->children; iter != NULL; iter = iter->next) {
             pcmk_resource_t *child = (pcmk_resource_t *)iter->data;
-            enum rsc_role_e child_role = child->priv->fns->state(child, TRUE);
+            enum rsc_role_e child_role = child->priv->fns->state(child, true);
 
             if (child_role == pcmk_role_promoted) {
                 count++;