Skip to content

Commit f3339c8

Browse files
nrwahl2nrwahl2
committed
Refactor: various: Use bool/const in pcmk__rsc_methods_t:is_filtered()
Signed-off-by: Reid Wahl <[email protected]>
1 parent 9cb0b5b commit f3339c8

File tree

7 files changed

+64
-64
lines changed

7 files changed

+64
-64
lines changed

‎include/crm/common/resources_internal.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,13 @@ typedef struct {
265265
*
266266
* \param[in] rsc Resource ID to check for
267267
* \param[in] only_rsc List of resource IDs to check
268-
* \param[in] check_parent If TRUE, check top ancestor as well
268+
* \param[in] check_parent If \c true, check top ancestor as well
269269
*
270-
* \return TRUE if \p rsc, its top parent if requested, or '*' is in
271-
* \p only_rsc, otherwise FALSE
270+
* \return \c true if \p rsc, its top parent if requested, or \c "*" is in
271+
* \p only_rsc, or \c false otherwise
272272
*/
273-
gboolean (*is_filtered)(const pcmk_resource_t *rsc, GList *only_rsc,
274-
gboolean check_parent);
273+
bool (*is_filtered)(const pcmk_resource_t *rsc, const GList *only_rsc,
274+
bool check_parent);
275275

276276
/*!
277277
* \internal

‎include/crm/pengine/internal.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -363,14 +363,14 @@ GList * pe__build_rsc_list(pcmk_scheduler_t *scheduler, const char *s);
363363

364364
bool pcmk__rsc_filtered_by_node(pcmk_resource_t *rsc, GList *only_node);
365365

366-
gboolean pe__bundle_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
367-
gboolean check_parent);
368-
gboolean pe__clone_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
369-
gboolean check_parent);
370-
gboolean pe__group_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
371-
gboolean check_parent);
372-
gboolean pe__native_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
373-
gboolean check_parent);
366+
bool pe__bundle_is_filtered(const pcmk_resource_t *rsc, const GList *only_rsc,
367+
bool check_parent);
368+
bool pe__clone_is_filtered(const pcmk_resource_t *rsc, const GList *only_rsc,
369+
bool check_parent);
370+
bool pe__group_is_filtered(const pcmk_resource_t *rsc, const GList *only_rsc,
371+
bool check_parent);
372+
bool pe__native_is_filtered(const pcmk_resource_t *rsc, const GList *only_rsc,
373+
bool check_parent);
374374

375375
xmlNode *pe__failed_probe_for_rsc(const pcmk_resource_t *rsc, const char *name);
376376

‎lib/pengine/bundle.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,14 +1401,14 @@ pe__bundle_xml(pcmk__output_t *out, va_list args)
14011401
pe__bundle_variant_data_t *bundle_data = NULL;
14021402
int rc = pcmk_rc_no_output;
14031403
gboolean printed_header = FALSE;
1404-
gboolean print_everything = TRUE;
1404+
bool print_everything = true;
14051405

14061406
const char *desc = NULL;
14071407

14081408
pcmk__assert(rsc != NULL);
14091409
get_bundle_variant_data(bundle_data, rsc);
14101410

1411-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
1411+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
14121412
return rc;
14131413
}
14141414

@@ -1572,14 +1572,14 @@ pe__bundle_html(pcmk__output_t *out, va_list args)
15721572
const char *desc = NULL;
15731573
pe__bundle_variant_data_t *bundle_data = NULL;
15741574
int rc = pcmk_rc_no_output;
1575-
gboolean print_everything = TRUE;
1575+
bool print_everything = true;
15761576

15771577
pcmk__assert(rsc != NULL);
15781578
get_bundle_variant_data(bundle_data, rsc);
15791579

15801580
desc = pe__resource_description(rsc, show_opts);
15811581

1582-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
1582+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
15831583
return rc;
15841584
}
15851585

@@ -1715,14 +1715,14 @@ pe__bundle_text(pcmk__output_t *out, va_list args)
17151715
const char *desc = NULL;
17161716
pe__bundle_variant_data_t *bundle_data = NULL;
17171717
int rc = pcmk_rc_no_output;
1718-
gboolean print_everything = TRUE;
1718+
bool print_everything = true;
17191719

17201720
desc = pe__resource_description(rsc, show_opts);
17211721

17221722
pcmk__assert(rsc != NULL);
17231723
get_bundle_variant_data(bundle_data, rsc);
17241724

1725-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
1725+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
17261726
return rc;
17271727
}
17281728

@@ -1929,15 +1929,15 @@ pe__count_bundle(pcmk_resource_t *rsc)
19291929
}
19301930
}
19311931

1932-
gboolean
1933-
pe__bundle_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
1934-
gboolean check_parent)
1932+
bool
1933+
pe__bundle_is_filtered(const pcmk_resource_t *rsc, const GList *only_rsc,
1934+
bool check_parent)
19351935
{
1936-
gboolean passes = FALSE;
1936+
bool passes = false;
19371937
pe__bundle_variant_data_t *bundle_data = NULL;
19381938

19391939
if (pcmk__str_in_list(rsc_printable_id(rsc), only_rsc, pcmk__str_star_matches)) {
1940-
passes = TRUE;
1940+
passes = true;
19411941
} else {
19421942
get_bundle_variant_data(bundle_data, rsc);
19431943

@@ -1949,23 +1949,23 @@ pe__bundle_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
19491949
pcmk_resource_t *remote = replica->remote;
19501950

19511951
if ((ip != NULL)
1952-
&& !ip->priv->fns->is_filtered(ip, only_rsc, FALSE)) {
1953-
passes = TRUE;
1952+
&& !ip->priv->fns->is_filtered(ip, only_rsc, false)) {
1953+
passes = true;
19541954
break;
19551955
}
19561956
if ((child != NULL)
1957-
&& !child->priv->fns->is_filtered(child, only_rsc, FALSE)) {
1958-
passes = TRUE;
1957+
&& !child->priv->fns->is_filtered(child, only_rsc, false)) {
1958+
passes = true;
19591959
break;
19601960
}
19611961
if (!container->priv->fns->is_filtered(container, only_rsc,
1962-
FALSE)) {
1963-
passes = TRUE;
1962+
false)) {
1963+
passes = true;
19641964
break;
19651965
}
19661966
if ((remote != NULL)
1967-
&& !remote->priv->fns->is_filtered(remote, only_rsc, FALSE)) {
1968-
passes = TRUE;
1967+
&& !remote->priv->fns->is_filtered(remote, only_rsc, false)) {
1968+
passes = true;
19691969
break;
19701970
}
19711971
}

‎lib/pengine/clone.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,9 @@ pe__clone_xml(pcmk__output_t *out, va_list args)
541541
GList *all = NULL;
542542
int rc = pcmk_rc_no_output;
543543
gboolean printed_header = FALSE;
544-
gboolean print_everything = TRUE;
544+
bool print_everything = true;
545545

546-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
546+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
547547
return rc;
548548
}
549549

@@ -639,7 +639,7 @@ pe__clone_default(pcmk__output_t *out, va_list args)
639639

640640
get_clone_variant_data(clone_data, rsc);
641641

642-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
642+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
643643
return rc;
644644
}
645645

@@ -991,15 +991,15 @@ pe__is_universal_clone(const pcmk_resource_t *rsc,
991991
return FALSE;
992992
}
993993

994-
gboolean
995-
pe__clone_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
996-
gboolean check_parent)
994+
bool
995+
pe__clone_is_filtered(const pcmk_resource_t *rsc, const GList *only_rsc,
996+
bool check_parent)
997997
{
998-
gboolean passes = FALSE;
998+
bool passes = FALSE;
999999
clone_variant_data_t *clone_data = NULL;
10001000

10011001
if (pcmk__str_in_list(rsc_printable_id(rsc), only_rsc, pcmk__str_star_matches)) {
1002-
passes = TRUE;
1002+
passes = true;
10031003
} else {
10041004
get_clone_variant_data(clone_data, rsc);
10051005
passes = pcmk__str_in_list(pcmk__xe_id(clone_data->xml_obj_child),
@@ -1013,8 +1013,8 @@ pe__clone_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
10131013

10141014
child_rsc = (const pcmk_resource_t *) iter->data;
10151015
if (!child_rsc->priv->fns->is_filtered(child_rsc, only_rsc,
1016-
FALSE)) {
1017-
passes = TRUE;
1016+
false)) {
1017+
passes = true;
10181018
break;
10191019
}
10201020
}

‎lib/pengine/group.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ skip_child_rsc(pcmk_resource_t *rsc, pcmk_resource_t *child,
159159
{
160160
bool star_list = pcmk__list_of_1(only_rsc) &&
161161
pcmk__str_eq("*", g_list_first(only_rsc)->data, pcmk__str_none);
162-
bool child_filtered = child->priv->fns->is_filtered(child, only_rsc, FALSE);
162+
bool child_filtered = child->priv->fns->is_filtered(child, only_rsc, false);
163163
bool child_active = child->priv->fns->active(child, false);
164164
bool show_inactive = pcmk_is_set(show_opts, pcmk_show_inactive_rscs);
165165

@@ -276,7 +276,7 @@ pe__group_xml(pcmk__output_t *out, va_list args)
276276

277277
desc = pe__resource_description(rsc, show_opts);
278278

279-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
279+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
280280
return rc;
281281
}
282282

@@ -341,7 +341,7 @@ pe__group_default(pcmk__output_t *out, va_list args)
341341

342342
desc = pe__resource_description(rsc, show_opts);
343343

344-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
344+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
345345
return rc;
346346
}
347347

@@ -422,30 +422,30 @@ group_resource_state(const pcmk_resource_t *rsc, bool current)
422422
return group_role;
423423
}
424424

425-
gboolean
426-
pe__group_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
427-
gboolean check_parent)
425+
bool
426+
pe__group_is_filtered(const pcmk_resource_t *rsc, const GList *only_rsc,
427+
bool check_parent)
428428
{
429-
gboolean passes = FALSE;
429+
bool passes = false;
430430

431431
if (check_parent
432432
&& pcmk__str_in_list(rsc_printable_id(pe__const_top_resource(rsc,
433433
false)),
434434
only_rsc, pcmk__str_star_matches)) {
435-
passes = TRUE;
435+
passes = true;
436436
} else if (pcmk__str_in_list(rsc_printable_id(rsc), only_rsc, pcmk__str_star_matches)) {
437-
passes = TRUE;
437+
passes = true;
438438
} else if (strstr(rsc->id, ":") != NULL && pcmk__str_in_list(rsc->id, only_rsc, pcmk__str_star_matches)) {
439-
passes = TRUE;
439+
passes = true;
440440
} else {
441441
for (const GList *iter = rsc->priv->children;
442442
iter != NULL; iter = iter->next) {
443443

444444
const pcmk_resource_t *child_rsc = iter->data;
445445

446446
if (!child_rsc->priv->fns->is_filtered(child_rsc, only_rsc,
447-
FALSE)) {
448-
passes = TRUE;
447+
false)) {
448+
passes = true;
449449
break;
450450
}
451451
}

‎lib/pengine/native.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ pe__resource_xml(pcmk__output_t *out, va_list args)
756756

757757
pcmk__assert(pcmk__is_primitive(rsc));
758758

759-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
759+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
760760
return pcmk_rc_no_output;
761761
}
762762

@@ -825,7 +825,7 @@ pe__resource_html(pcmk__output_t *out, va_list args)
825825

826826
const pcmk_node_t *node = pcmk__current_node(rsc);
827827

828-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
828+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
829829
return pcmk_rc_no_output;
830830
}
831831

@@ -852,7 +852,7 @@ pe__resource_text(pcmk__output_t *out, va_list args)
852852

853853
pcmk__assert(pcmk__is_primitive(rsc));
854854

855-
if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
855+
if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
856856
return pcmk_rc_no_output;
857857
}
858858

@@ -1125,20 +1125,20 @@ pe__rscs_brief_output(pcmk__output_t *out, GList *rsc_list, uint32_t show_opts)
11251125
return rc;
11261126
}
11271127

1128-
gboolean
1129-
pe__native_is_filtered(const pcmk_resource_t *rsc, GList *only_rsc,
1130-
gboolean check_parent)
1128+
bool
1129+
pe__native_is_filtered(const pcmk_resource_t *rsc, const GList *only_rsc,
1130+
bool check_parent)
11311131
{
11321132
if (pcmk__str_in_list(rsc_printable_id(rsc), only_rsc, pcmk__str_star_matches) ||
11331133
pcmk__str_in_list(rsc->id, only_rsc, pcmk__str_star_matches)) {
1134-
return FALSE;
1134+
return false;
11351135
} else if (check_parent && (rsc->priv->parent != NULL)) {
11361136
const pcmk_resource_t *up = pe__const_top_resource(rsc, true);
11371137

1138-
return up->priv->fns->is_filtered(up, only_rsc, FALSE);
1138+
return up->priv->fns->is_filtered(up, only_rsc, false);
11391139
}
11401140

1141-
return TRUE;
1141+
return true;
11421142
}
11431143

11441144
/*!

‎lib/pengine/pe_output.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2491,7 +2491,7 @@ node_history_list(pcmk__output_t *out, va_list args) {
24912491
pcmk__str_star_matches)) {
24922492
continue;
24932493
}
2494-
} else if (rsc->priv->fns->is_filtered(rsc, only_rsc, TRUE)) {
2494+
} else if (rsc->priv->fns->is_filtered(rsc, only_rsc, true)) {
24952495
continue;
24962496
}
24972497

0 commit comments

Comments
 (0)