Skip to content

Commit cb7e35b

Browse files
Ken Gaillotclumens
authored andcommitted
Refactor: controller: drop no-longer-used section enum values
1 parent 190d4fd commit cb7e35b

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

daemons/controld/controld_cib.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -279,17 +279,6 @@ cib_delete_callback(xmlNode *msg, int call_id, int rc, xmlNode *output,
279279
"[not(@" PCMK_OPT_SHUTDOWN_LOCK ") " \
280280
"or " PCMK_OPT_SHUTDOWN_LOCK "<%lld]"
281281

282-
// Node's PCMK__XE_TRANSIENT_ATTRIBUTES section (name 1x)
283-
#define XPATH_NODE_ATTRS XPATH_NODE_STATE "/" PCMK__XE_TRANSIENT_ATTRIBUTES
284-
285-
// Everything under PCMK__XE_NODE_STATE (name 1x)
286-
#define XPATH_NODE_ALL XPATH_NODE_STATE "/*"
287-
288-
/* Unlocked history + transient attributes
289-
* (name 2x, (seconds_since_epoch - PCMK_OPT_SHUTDOWN_LOCK_LIMIT) 1x, name 1x)
290-
*/
291-
#define XPATH_NODE_ALL_UNLOCKED XPATH_NODE_LRM_UNLOCKED "|" XPATH_NODE_ATTRS
292-
293282
/*!
294283
* \internal
295284
* \brief Get the XPath and description of a node state section to be deleted
@@ -320,19 +309,6 @@ controld_node_state_deletion_strings(const char *uname,
320309
uname, expire);
321310
desc_pre = "resource history (other than shutdown locks)";
322311
break;
323-
case controld_section_attrs:
324-
*xpath = pcmk__assert_asprintf(XPATH_NODE_ATTRS, uname);
325-
desc_pre = "transient attributes";
326-
break;
327-
case controld_section_all:
328-
*xpath = pcmk__assert_asprintf(XPATH_NODE_ALL, uname);
329-
desc_pre = "all state";
330-
break;
331-
case controld_section_all_unlocked:
332-
*xpath = pcmk__assert_asprintf(XPATH_NODE_ALL_UNLOCKED, uname,
333-
uname, expire, uname);
334-
desc_pre = "all state (other than shutdown locks)";
335-
break;
336312
default:
337313
// We called this function incorrectly
338314
pcmk__assert(false);

daemons/controld/controld_cib.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2004-2024 the Pacemaker project contributors
2+
* Copyright 2004-2025 the Pacemaker project contributors
33
*
44
* The version control history for this file may have further details.
55
*
@@ -50,9 +50,6 @@ unsigned int cib_op_timeout(void);
5050
enum controld_section_e {
5151
controld_section_lrm,
5252
controld_section_lrm_unlocked,
53-
controld_section_attrs,
54-
controld_section_all,
55-
controld_section_all_unlocked
5653
};
5754

5855
void controld_node_state_deletion_strings(const char *uname,

0 commit comments

Comments
 (0)