Refactor: various: Use bool/const in pcmk__rsc_methods_t:active()

nrwahl2 · nrwahl2 · commit 1bd18aae3f9f · 2025-03-10T03:47:19.000-07:00
Signed-off-by: Reid Wahl &lt;nrwahl@protonmail.com&gt;
diff --git a/include/crm/common/resources_internal.h b/include/crm/common/resources_internal.h
@@ -212,7 +212,7 @@ typedef struct {
      *
      * \return TRUE if \p rsc is active, otherwise FALSE
      */
-    gboolean (*active)(pcmk_resource_t *rsc, gboolean all);
+    bool (*active)(const pcmk_resource_t *rsc, bool all);
 
     /*!
      * \internal
diff --git a/include/crm/pengine/internal.h b/include/crm/pengine/internal.h
@@ -71,10 +71,10 @@ bool pe__unpack_bundle(pcmk_resource_t *rsc);
 pcmk_resource_t *native_find_rsc(pcmk_resource_t *rsc, const char *id,
                                  const pcmk_node_t *node, uint32_t flags);
 
-gboolean native_active(pcmk_resource_t *rsc, gboolean all);
-gboolean group_active(pcmk_resource_t *rsc, gboolean all);
-gboolean clone_active(pcmk_resource_t *rsc, gboolean all);
-gboolean pe__bundle_active(pcmk_resource_t *rsc, gboolean all);
+bool native_active(const pcmk_resource_t *rsc, bool all);
+bool group_active(const pcmk_resource_t *rsc, bool all);
+bool clone_active(const pcmk_resource_t *rsc, bool all);
+bool pe__bundle_active(const pcmk_resource_t *rsc, bool all);
 
 gchar *pcmk__native_output_string(const pcmk_resource_t *rsc, const char *name,
                                   const pcmk_node_t *node, uint32_t show_opts,
diff --git a/lib/pengine/bundle.c b/lib/pengine/bundle.c
@@ -1320,8 +1320,8 @@ replica_resource_active(pcmk_resource_t *rsc, gboolean all)
     return -1;
 }
 
-gboolean
-pe__bundle_active(pcmk_resource_t *rsc, gboolean all)
+bool
+pe__bundle_active(const pcmk_resource_t *rsc, bool all)
 {
     pe__bundle_variant_data_t *bundle_data = NULL;
     GList *iter = NULL;
@@ -1333,22 +1333,22 @@ pe__bundle_active(pcmk_resource_t *rsc, gboolean all)
 
         rsc_active = replica_resource_active(replica->ip, all);
         if (rsc_active >= 0) {
-            return (gboolean) rsc_active;
+            return (bool) rsc_active;
         }
 
         rsc_active = replica_resource_active(replica->child, all);
         if (rsc_active >= 0) {
-            return (gboolean) rsc_active;
+            return (bool) rsc_active;
         }
 
         rsc_active = replica_resource_active(replica->container, all);
         if (rsc_active >= 0) {
-            return (gboolean) rsc_active;
+            return (bool) rsc_active;
         }
 
         rsc_active = replica_resource_active(replica->remote, all);
         if (rsc_active >= 0) {
-            return (gboolean) rsc_active;
+            return (bool) rsc_active;
         }
     }
 
diff --git a/lib/pengine/clone.c b/lib/pengine/clone.c
@@ -441,14 +441,14 @@ clone_unpack(pcmk_resource_t *rsc)
     return TRUE;
 }
 
-gboolean
-clone_active(pcmk_resource_t * rsc, gboolean all)
+bool
+clone_active(const pcmk_resource_t *rsc, bool all)
 {
     for (GList *gIter = rsc->priv->children;
          gIter != NULL; gIter = gIter->next) {
 
         pcmk_resource_t *child_rsc = (pcmk_resource_t *) gIter->data;
-        gboolean child_active = child_rsc->priv->fns->active(child_rsc, all);
+        bool child_active = child_rsc->priv->fns->active(child_rsc, all);
 
         if (all == FALSE && child_active) {
             return TRUE;
@@ -649,8 +649,7 @@ pe__clone_default(pcmk__output_t *out, va_list args)
     for (gIter = rsc->priv->children; gIter != NULL; gIter = gIter->next) {
         gboolean print_full = FALSE;
         pcmk_resource_t *child_rsc = (pcmk_resource_t *) gIter->data;
-        gboolean partially_active = child_rsc->priv->fns->active(child_rsc,
-                                                                 FALSE);
+        bool partially_active = child_rsc->priv->fns->active(child_rsc, false);
 
         if (pcmk__rsc_filtered_by_node(child_rsc, only_node)) {
             continue;
@@ -699,7 +698,7 @@ pe__clone_default(pcmk__output_t *out, va_list args)
             // Print individual instance when active orphaned/unmanaged/failed
             print_full = TRUE;
 
-        } else if (child_rsc->priv->fns->active(child_rsc, TRUE)) {
+        } else if (child_rsc->priv->fns->active(child_rsc, true)) {
             // Instance of fully active anonymous clone
 
             pcmk_node_t *location = NULL;
diff --git a/lib/pengine/group.c b/lib/pengine/group.c
@@ -108,7 +108,7 @@ inactive_resources(pcmk_resource_t *rsc)
 
         pcmk_resource_t *child_rsc = (pcmk_resource_t *) gIter->data;
 
-        if (!child_rsc->priv->fns->active(child_rsc, TRUE)) {
+        if (!child_rsc->priv->fns->active(child_rsc, true)) {
             retval++;
         }
     }
@@ -160,7 +160,7 @@ skip_child_rsc(pcmk_resource_t *rsc, pcmk_resource_t *child,
     bool star_list = pcmk__list_of_1(only_rsc) &&
                      pcmk__str_eq("*", g_list_first(only_rsc)->data, pcmk__str_none);
     bool child_filtered = child->priv->fns->is_filtered(child, only_rsc, FALSE);
-    bool child_active = child->priv->fns->active(child, FALSE);
+    bool child_active = child->priv->fns->active(child, false);
     bool show_inactive = pcmk_is_set(show_opts, pcmk_show_inactive_rscs);
 
     /* If the resource is in only_rsc by name (so, ignoring "*") then allow
@@ -231,8 +231,8 @@ group_unpack(pcmk_resource_t *rsc)
     return TRUE;
 }
 
-gboolean
-group_active(pcmk_resource_t *rsc, gboolean all)
+bool
+group_active(const pcmk_resource_t *rsc, bool all)
 {
     gboolean c_all = TRUE;
     gboolean c_any = FALSE;
@@ -336,8 +336,8 @@ pe__group_default(pcmk__output_t *out, va_list args)
     gboolean parent_passes = pcmk__str_in_list(rsc_printable_id(rsc), only_rsc, pcmk__str_star_matches) ||
                              (strstr(rsc->id, ":") != NULL && pcmk__str_in_list(rsc->id, only_rsc, pcmk__str_star_matches));
 
-    gboolean active = rsc->priv->fns->active(rsc, TRUE);
-    gboolean partially_active = rsc->priv->fns->active(rsc, FALSE);
+    bool active = rsc->priv->fns->active(rsc, true);
+    bool partially_active = rsc->priv->fns->active(rsc, false);
 
     desc = pe__resource_description(rsc, show_opts);
 
diff --git a/lib/pengine/native.c b/lib/pengine/native.c
@@ -321,8 +321,8 @@ native_find_rsc(pcmk_resource_t *rsc, const char *id,
     return NULL;
 }
 
-gboolean
-native_active(pcmk_resource_t * rsc, gboolean all)
+bool
+native_active(const pcmk_resource_t *rsc, bool all)
 {
     for (GList *gIter = rsc->priv->active_nodes;
          gIter != NULL; gIter = gIter->next) {
@@ -741,7 +741,7 @@ pe__resource_xml(pcmk__output_t *out, va_list args)
     char ra_name[LINE_MAX];
     const char *rsc_state = native_displayable_state(rsc, print_pending);
     const char *target_role = NULL;
-    const char *active = pcmk__btoa(rsc->priv->fns->active(rsc, TRUE));
+    const char *active = pcmk__btoa(rsc->priv->fns->active(rsc, true));
     const char *orphaned = pcmk__flag_text(rsc->flags, pcmk__rsc_removed);
     const char *blocked = pcmk__flag_text(rsc->flags, pcmk__rsc_blocked);
     const char *maintenance = pcmk__flag_text(rsc->flags,
diff --git a/lib/pengine/pe_actions.c b/lib/pengine/pe_actions.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.
  *
@@ -389,7 +389,7 @@ update_resource_action_runnable(pcmk_action_t *action,
                 break;
 
             case pcmk_no_quorum_freeze:
-                if (!rsc->priv->fns->active(rsc, TRUE)
+                if (!rsc->priv->fns->active(rsc, true)
                     || (rsc->priv->next_role > rsc->priv->orig_role)) {
                     pcmk__rsc_debug(rsc, "%s on %s is unrunnable (no quorum)",
                                     action->uuid,
diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the Pacemaker project contributors
+ * Copyright 2019-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -3060,8 +3060,8 @@ resource_list(pcmk__output_t *out, va_list args)
         int x;
 
         /* Complex resources may have some sub-resources active and some inactive */
-        gboolean is_active = rsc->priv->fns->active(rsc, TRUE);
-        gboolean partially_active = rsc->priv->fns->active(rsc, FALSE);
+        bool is_active = rsc->priv->fns->active(rsc, true);
+        bool partially_active = rsc->priv->fns->active(rsc, false);
 
         /* Skip inactive orphans (deleted but still in CIB) */
         if (pcmk_is_set(rsc->flags, pcmk__rsc_removed) && !is_active) {
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.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.
  *
@@ -747,7 +747,7 @@ pe__rsc_running_on_any(pcmk_resource_t *rsc, GList *node_list)
 bool
 pcmk__rsc_filtered_by_node(pcmk_resource_t *rsc, GList *only_node)
 {
-    return rsc->priv->fns->active(rsc, FALSE)
+    return rsc->priv->fns->active(rsc, false)
            && !pe__rsc_running_on_any(rsc, only_node);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ typedef struct {`
`212`	`212`	`*`
`213`	`213`	`* \return TRUE if \p rsc is active, otherwise FALSE`
`214`	`214`	`*/`
`215`		`- gboolean (active)(pcmk_resource_t rsc, gboolean all);`
	`215`	`+ bool (active)(const pcmk_resource_t rsc, bool all);`
`216`	`216`
`217`	`217`	`/*!`
`218`	`218`	`* \internal`
Original file line number	Diff line number	Diff line change
`@@ -1320,8 +1320,8 @@ replica_resource_active(pcmk_resource_t *rsc, gboolean all)`
`1320`	`1320`	`return -1;`
`1321`	`1321`	`}`
`1322`	`1322`
`1323`		`-gboolean`
`1324`		`-pe__bundle_active(pcmk_resource_t *rsc, gboolean all)`
	`1323`	`+bool`
	`1324`	`+pe__bundle_active(const pcmk_resource_t *rsc, bool all)`
`1325`	`1325`	`{`
`1326`	`1326`	`pe__bundle_variant_data_t *bundle_data = NULL;`
`1327`	`1327`	`GList *iter = NULL;`
`@@ -1333,22 +1333,22 @@ pe__bundle_active(pcmk_resource_t *rsc, gboolean all)`
`1333`	`1333`
`1334`	`1334`	`rsc_active = replica_resource_active(replica->ip, all);`
`1335`	`1335`	`if (rsc_active >= 0) {`
`1336`		`- return (gboolean) rsc_active;`
	`1336`	`+ return (bool) rsc_active;`
`1337`	`1337`	`}`
`1338`	`1338`
`1339`	`1339`	`rsc_active = replica_resource_active(replica->child, all);`
`1340`	`1340`	`if (rsc_active >= 0) {`
`1341`		`- return (gboolean) rsc_active;`
	`1341`	`+ return (bool) rsc_active;`
`1342`	`1342`	`}`
`1343`	`1343`
`1344`	`1344`	`rsc_active = replica_resource_active(replica->container, all);`
`1345`	`1345`	`if (rsc_active >= 0) {`
`1346`		`- return (gboolean) rsc_active;`
	`1346`	`+ return (bool) rsc_active;`
`1347`	`1347`	`}`
`1348`	`1348`
`1349`	`1349`	`rsc_active = replica_resource_active(replica->remote, all);`
`1350`	`1350`	`if (rsc_active >= 0) {`
`1351`		`- return (gboolean) rsc_active;`
	`1351`	`+ return (bool) rsc_active;`
`1352`	`1352`	`}`
`1353`	`1353`	`}`
`1354`	`1354`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2004-2024 the Pacemaker project contributors`
	`2`	`+ * Copyright 2004-2025 the Pacemaker project contributors`
`3`	`3`	`*`
`4`	`4`	`* The version control history for this file may have further details.`
`5`	`5`	`*`
`@@ -389,7 +389,7 @@ update_resource_action_runnable(pcmk_action_t *action,`
`389`	`389`	`break;`
`390`	`390`
`391`	`391`	`case pcmk_no_quorum_freeze:`
`392`		`- if (!rsc->priv->fns->active(rsc, TRUE)`
	`392`	`+ if (!rsc->priv->fns->active(rsc, true)`
`393`	`393`	`\|\| (rsc->priv->next_role > rsc->priv->orig_role)) {`
`394`	`394`	`pcmk__rsc_debug(rsc, "%s on %s is unrunnable (no quorum)",`
`395`	`395`	`action->uuid,`