Skip to content

Commit a871bb3

Browse files
nrwahl2nrwahl2
committed
Refactor: libpe_status: Drop pe__name_and_nvpairs_xml()
It's the same as pcmk__output_xml_create_parent() when is_list is true, and it's the same as pcmk__output_create_xml_node() when is_list is false. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
1 parent dba8f77 commit a871bb3

6 files changed

Lines changed: 75 additions & 98 deletions

File tree

‎include/crm/pengine/internal.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ 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-
void pe__name_and_nvpairs_xml(pcmk__output_t *out, bool is_list,
81-
const char *tag_name, ...) G_GNUC_NULL_TERMINATED;
8280
char *pe__node_display_name(pcmk_node_t *node, bool print_detail);
8381

8482

‎lib/pengine/bundle.c‎

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

14691469
desc = pe__resource_description(rsc, show_opts);
14701470

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);
1471+
pcmk__output_xml_create_parent(out, 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);
14811481
}
14821482

14831483
id = pcmk__itoa(replica->offset);
1484-
pe__name_and_nvpairs_xml(out, true, PCMK_XE_REPLICA,
1485-
PCMK_XA_ID, id,
1486-
NULL);
1484+
pcmk__output_xml_create_parent(out, PCMK_XE_REPLICA,
1485+
PCMK_XA_ID, id,
1486+
NULL);
14871487
free(id);
14881488

14891489
rc = pcmk_rc_ok;

‎lib/pengine/clone.c‎

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

587587
printed_header = TRUE;
588588

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);
589+
pcmk__output_xml_create_parent(out, 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);
601601
}
602602

603603
rc = pcmk_rc_ok;

‎lib/pengine/group.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,14 @@ 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-
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+
pcmk__output_xml_create_parent(out, 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);
309309
rc = pcmk_rc_ok;
310310
free(count);
311311
}
@@ -382,7 +382,7 @@ pe__group_default(pcmk__output_t *out, va_list args)
382382
}
383383
}
384384

385-
PCMK__OUTPUT_LIST_FOOTER(out, rc);
385+
PCMK__OUTPUT_LIST_FOOTER(out, rc);
386386

387387
return rc;
388388
}

‎lib/pengine/native.c‎

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

784784
// @COMPAT PCMK_XA_ORPHANED is deprecated since 3.0.2
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);
785+
pcmk__output_xml_create_parent(out, 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);
803803
rc = pcmk_rc_ok;
804804
free(ra_name);
805805
free(nodes_running_on);
@@ -810,11 +810,11 @@ pe__resource_xml(pcmk__output_t *out, va_list args)
810810
pcmk_node_t *node = (pcmk_node_t *) gIter->data;
811811
const char *cached = pcmk__btoa(node->details->online);
812812

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);
813+
pcmk__output_create_xml_node(out, PCMK_XE_NODE,
814+
PCMK_XA_NAME, node->priv->name,
815+
PCMK_XA_ID, node->priv->id,
816+
PCMK_XA_CACHED, cached,
817+
NULL);
818818
}
819819

820820
pcmk__output_xml_pop_parent(out);

‎lib/pengine/pe_output.c‎

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

633-
void
634-
pe__name_and_nvpairs_xml(pcmk__output_t *out, bool is_list, const char *tag_name,
635-
...)
636-
{
637-
xmlNodePtr xml_node = NULL;
638-
va_list pairs;
639-
640-
pcmk__assert(tag_name != NULL);
641-
642-
xml_node = pcmk__output_xml_peek_parent(out);
643-
pcmk__assert(xml_node != NULL);
644-
xml_node = pcmk__xe_create(xml_node, tag_name);
645-
646-
va_start(pairs, tag_name);
647-
pcmk__xe_set_propv(xml_node, pairs);
648-
va_end(pairs);
649-
650-
if (is_list) {
651-
pcmk__output_xml_push_parent(out, xml_node);
652-
}
653-
}
654-
655633
static const char *
656634
role_desc(enum rsc_role_e role)
657635
{
@@ -2093,23 +2071,24 @@ node_xml(pcmk__output_t *out, va_list args) {
20932071
char *resources_running = pcmk__itoa(length);
20942072
const char *node_type = node_variant_text(node->priv->variant);
20952073

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);
2074+
pcmk__output_xml_create_parent(out, PCMK_XE_NODE,
2075+
PCMK_XA_NAME, node->priv->name,
2076+
PCMK_XA_ID, node->priv->id,
2077+
PCMK_XA_ONLINE, online,
2078+
PCMK_XA_STANDBY, standby,
2079+
PCMK_XA_STANDBY_ONFAIL, standby_onfail,
2080+
PCMK_XA_MAINTENANCE, maintenance,
2081+
PCMK_XA_PENDING, pending,
2082+
PCMK_XA_UNCLEAN, unclean,
2083+
PCMK_XA_HEALTH, health,
2084+
PCMK_XA_FEATURE_SET, feature_set,
2085+
PCMK_XA_SHUTDOWN, shutdown,
2086+
PCMK_XA_EXPECTED_UP, expected_up,
2087+
PCMK_XA_IS_DC, pcmk__btoa(is_dc),
2088+
PCMK_XA_RESOURCES_RUNNING,
2089+
resources_running,
2090+
PCMK_XA_TYPE, node_type,
2091+
NULL);
21132092

21142093
free(resources_running);
21152094

0 commit comments

Comments
 (0)