Skip to content

Commit dba8f77

Browse files
nrwahl2nrwahl2
committed
Refactor: libpe_status: Return void from pe__name_and_nvpairs_xml()
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
1 parent a0f7c97 commit dba8f77

6 files changed

Lines changed: 81 additions & 87 deletions

File tree

‎include/crm/pengine/internal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ gchar *pcmk__native_output_string(const pcmk_resource_t *rsc, const char *name,
7777
const pcmk_node_t *node, uint32_t show_opts,
7878
const char *target_role, bool show_nodes);
7979

80-
int pe__name_and_nvpairs_xml(pcmk__output_t *out, bool is_list, const char *tag_name,
81-
...) G_GNUC_NULL_TERMINATED;
80+
void pe__name_and_nvpairs_xml(pcmk__output_t *out, bool is_list,
81+
const char *tag_name, ...) G_GNUC_NULL_TERMINATED;
8282
char *pe__node_display_name(pcmk_node_t *node, bool print_detail);
8383

8484

‎lib/pengine/bundle.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,25 +1468,25 @@ pe__bundle_xml(pcmk__output_t *out, va_list args)
14681468

14691469
desc = pe__resource_description(rsc, show_opts);
14701470

1471-
rc = pe__name_and_nvpairs_xml(out, true, PCMK_XE_BUNDLE,
1472-
PCMK_XA_ID, rsc->id,
1473-
PCMK_XA_TYPE, type,
1474-
PCMK_XA_IMAGE, bundle_data->image,
1475-
PCMK_XA_UNIQUE, unique,
1476-
PCMK_XA_MAINTENANCE, maintenance,
1477-
PCMK_XA_MANAGED, managed,
1478-
PCMK_XA_FAILED, failed,
1479-
PCMK_XA_DESCRIPTION, desc,
1480-
NULL);
1481-
pcmk__assert(rc == pcmk_rc_ok);
1471+
pe__name_and_nvpairs_xml(out, true, PCMK_XE_BUNDLE,
1472+
PCMK_XA_ID, rsc->id,
1473+
PCMK_XA_TYPE, type,
1474+
PCMK_XA_IMAGE, bundle_data->image,
1475+
PCMK_XA_UNIQUE, unique,
1476+
PCMK_XA_MAINTENANCE, maintenance,
1477+
PCMK_XA_MANAGED, managed,
1478+
PCMK_XA_FAILED, failed,
1479+
PCMK_XA_DESCRIPTION, desc,
1480+
NULL);
14821481
}
14831482

14841483
id = pcmk__itoa(replica->offset);
1485-
rc = pe__name_and_nvpairs_xml(out, true, PCMK_XE_REPLICA,
1486-
PCMK_XA_ID, id,
1487-
NULL);
1484+
pe__name_and_nvpairs_xml(out, true, PCMK_XE_REPLICA,
1485+
PCMK_XA_ID, id,
1486+
NULL);
14881487
free(id);
1489-
pcmk__assert(rc == pcmk_rc_ok);
1488+
1489+
rc = pcmk_rc_ok;
14901490

14911491
if (print_ip) {
14921492
out->message(out, (const char *) ip->priv->xml->name, show_opts,

‎lib/pengine/clone.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -586,21 +586,21 @@ pe__clone_xml(pcmk__output_t *out, va_list args)
586586

587587
printed_header = TRUE;
588588

589-
rc = pe__name_and_nvpairs_xml(out, true, PCMK_XE_CLONE,
590-
PCMK_XA_ID, rsc->id,
591-
PCMK_XA_MULTI_STATE, multi_state,
592-
PCMK_XA_UNIQUE, unique,
593-
PCMK_XA_MAINTENANCE, maintenance,
594-
PCMK_XA_MANAGED, managed,
595-
PCMK_XA_DISABLED, disabled,
596-
PCMK_XA_FAILED, failed,
597-
PCMK_XA_FAILURE_IGNORED, ignored,
598-
PCMK_XA_TARGET_ROLE, target_role,
599-
PCMK_XA_DESCRIPTION, desc,
600-
NULL);
601-
pcmk__assert(rc == pcmk_rc_ok);
589+
pe__name_and_nvpairs_xml(out, true, PCMK_XE_CLONE,
590+
PCMK_XA_ID, rsc->id,
591+
PCMK_XA_MULTI_STATE, multi_state,
592+
PCMK_XA_UNIQUE, unique,
593+
PCMK_XA_MAINTENANCE, maintenance,
594+
PCMK_XA_MANAGED, managed,
595+
PCMK_XA_DISABLED, disabled,
596+
PCMK_XA_FAILED, failed,
597+
PCMK_XA_FAILURE_IGNORED, ignored,
598+
PCMK_XA_TARGET_ROLE, target_role,
599+
PCMK_XA_DESCRIPTION, desc,
600+
NULL);
602601
}
603602

603+
rc = pcmk_rc_ok;
604604
out->message(out, (const char *) child_rsc->priv->xml->name,
605605
show_opts, child_rsc, only_node, all);
606606
}

‎lib/pengine/group.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,16 +298,16 @@ pe__group_xml(pcmk__output_t *out, va_list args)
298298
pcmk__rsc_managed);
299299
const char *disabled = pcmk__btoa(pe__resource_is_disabled(rsc));
300300

301-
rc = pe__name_and_nvpairs_xml(out, true, PCMK_XE_GROUP,
302-
PCMK_XA_ID, rsc->id,
303-
PCMK_XA_NUMBER_RESOURCES, count,
304-
PCMK_XA_MAINTENANCE, maintenance,
305-
PCMK_XA_MANAGED, managed,
306-
PCMK_XA_DISABLED, disabled,
307-
PCMK_XA_DESCRIPTION, desc,
308-
NULL);
301+
pe__name_and_nvpairs_xml(out, true, PCMK_XE_GROUP,
302+
PCMK_XA_ID, rsc->id,
303+
PCMK_XA_NUMBER_RESOURCES, count,
304+
PCMK_XA_MAINTENANCE, maintenance,
305+
PCMK_XA_MANAGED, managed,
306+
PCMK_XA_DISABLED, disabled,
307+
PCMK_XA_DESCRIPTION, desc,
308+
NULL);
309+
rc = pcmk_rc_ok;
309310
free(count);
310-
pcmk__assert(rc == pcmk_rc_ok);
311311
}
312312

313313
out->message(out, (const char *) child_rsc->priv->xml->name,

‎lib/pengine/native.c‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -782,41 +782,39 @@ pe__resource_xml(pcmk__output_t *out, va_list args)
782782
}
783783

784784
// @COMPAT PCMK_XA_ORPHANED is deprecated since 3.0.2
785-
rc = pe__name_and_nvpairs_xml(out, true, PCMK_XE_RESOURCE,
786-
PCMK_XA_ID, rsc_printable_id(rsc),
787-
PCMK_XA_RESOURCE_AGENT, ra_name,
788-
PCMK_XA_ROLE, rsc_state,
789-
PCMK_XA_TARGET_ROLE, target_role,
790-
PCMK_XA_ACTIVE, active,
791-
PCMK_XA_ORPHANED, removed,
792-
PCMK_XA_REMOVED, removed,
793-
PCMK_XA_BLOCKED, blocked,
794-
PCMK_XA_MAINTENANCE, maintenance,
795-
PCMK_XA_MANAGED, managed,
796-
PCMK_XA_FAILED, failed,
797-
PCMK_XA_FAILURE_IGNORED, ignored,
798-
PCMK_XA_NODES_RUNNING_ON, nodes_running_on,
799-
PCMK_XA_PENDING, pending,
800-
PCMK_XA_LOCKED_TO, locked_to,
801-
PCMK_XA_DESCRIPTION, desc,
802-
NULL);
785+
pe__name_and_nvpairs_xml(out, true, PCMK_XE_RESOURCE,
786+
PCMK_XA_ID, rsc_printable_id(rsc),
787+
PCMK_XA_RESOURCE_AGENT, ra_name,
788+
PCMK_XA_ROLE, rsc_state,
789+
PCMK_XA_TARGET_ROLE, target_role,
790+
PCMK_XA_ACTIVE, active,
791+
PCMK_XA_ORPHANED, removed,
792+
PCMK_XA_REMOVED, removed,
793+
PCMK_XA_BLOCKED, blocked,
794+
PCMK_XA_MAINTENANCE, maintenance,
795+
PCMK_XA_MANAGED, managed,
796+
PCMK_XA_FAILED, failed,
797+
PCMK_XA_FAILURE_IGNORED, ignored,
798+
PCMK_XA_NODES_RUNNING_ON, nodes_running_on,
799+
PCMK_XA_PENDING, pending,
800+
PCMK_XA_LOCKED_TO, locked_to,
801+
PCMK_XA_DESCRIPTION, desc,
802+
NULL);
803+
rc = pcmk_rc_ok;
803804
free(ra_name);
804805
free(nodes_running_on);
805806

806-
pcmk__assert(rc == pcmk_rc_ok);
807-
808807
for (GList *gIter = rsc->priv->active_nodes;
809808
gIter != NULL; gIter = gIter->next) {
810809

811810
pcmk_node_t *node = (pcmk_node_t *) gIter->data;
812811
const char *cached = pcmk__btoa(node->details->online);
813812

814-
rc = pe__name_and_nvpairs_xml(out, false, PCMK_XE_NODE,
815-
PCMK_XA_NAME, node->priv->name,
816-
PCMK_XA_ID, node->priv->id,
817-
PCMK_XA_CACHED, cached,
818-
NULL);
819-
pcmk__assert(rc == pcmk_rc_ok);
813+
pe__name_and_nvpairs_xml(out, false, PCMK_XE_NODE,
814+
PCMK_XA_NAME, node->priv->name,
815+
PCMK_XA_ID, node->priv->id,
816+
PCMK_XA_CACHED, cached,
817+
NULL);
820818
}
821819

822820
pcmk__output_xml_pop_parent(out);

‎lib/pengine/pe_output.c‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ pe__node_display_name(pcmk_node_t *node, bool print_detail)
630630
return node_name;
631631
}
632632

633-
int
633+
void
634634
pe__name_and_nvpairs_xml(pcmk__output_t *out, bool is_list, const char *tag_name,
635635
...)
636636
{
@@ -650,7 +650,6 @@ pe__name_and_nvpairs_xml(pcmk__output_t *out, bool is_list, const char *tag_name
650650
if (is_list) {
651651
pcmk__output_xml_push_parent(out, xml_node);
652652
}
653-
return pcmk_rc_ok;
654653
}
655654

656655
static const char *
@@ -2094,28 +2093,25 @@ node_xml(pcmk__output_t *out, va_list args) {
20942093
char *resources_running = pcmk__itoa(length);
20952094
const char *node_type = node_variant_text(node->priv->variant);
20962095

2097-
int rc = pcmk_rc_ok;
2098-
2099-
rc = pe__name_and_nvpairs_xml(out, true, PCMK_XE_NODE,
2100-
PCMK_XA_NAME, node->priv->name,
2101-
PCMK_XA_ID, node->priv->id,
2102-
PCMK_XA_ONLINE, online,
2103-
PCMK_XA_STANDBY, standby,
2104-
PCMK_XA_STANDBY_ONFAIL, standby_onfail,
2105-
PCMK_XA_MAINTENANCE, maintenance,
2106-
PCMK_XA_PENDING, pending,
2107-
PCMK_XA_UNCLEAN, unclean,
2108-
PCMK_XA_HEALTH, health,
2109-
PCMK_XA_FEATURE_SET, feature_set,
2110-
PCMK_XA_SHUTDOWN, shutdown,
2111-
PCMK_XA_EXPECTED_UP, expected_up,
2112-
PCMK_XA_IS_DC, pcmk__btoa(is_dc),
2113-
PCMK_XA_RESOURCES_RUNNING, resources_running,
2114-
PCMK_XA_TYPE, node_type,
2115-
NULL);
2096+
pe__name_and_nvpairs_xml(out, true, PCMK_XE_NODE,
2097+
PCMK_XA_NAME, node->priv->name,
2098+
PCMK_XA_ID, node->priv->id,
2099+
PCMK_XA_ONLINE, online,
2100+
PCMK_XA_STANDBY, standby,
2101+
PCMK_XA_STANDBY_ONFAIL, standby_onfail,
2102+
PCMK_XA_MAINTENANCE, maintenance,
2103+
PCMK_XA_PENDING, pending,
2104+
PCMK_XA_UNCLEAN, unclean,
2105+
PCMK_XA_HEALTH, health,
2106+
PCMK_XA_FEATURE_SET, feature_set,
2107+
PCMK_XA_SHUTDOWN, shutdown,
2108+
PCMK_XA_EXPECTED_UP, expected_up,
2109+
PCMK_XA_IS_DC, pcmk__btoa(is_dc),
2110+
PCMK_XA_RESOURCES_RUNNING, resources_running,
2111+
PCMK_XA_TYPE, node_type,
2112+
NULL);
21162113

21172114
free(resources_running);
2118-
pcmk__assert(rc == pcmk_rc_ok);
21192115

21202116
if (pcmk__is_guest_or_bundle_node(node)) {
21212117
xmlNodePtr xml_node = pcmk__output_xml_peek_parent(out);

0 commit comments

Comments
 (0)