Skip to content

Commit 3f33dc8

Browse files
committed
Refactor: libpacemaker: pcmk__check_rules() takes const char *const *
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
1 parent ceeae45 commit 3f33dc8

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

include/pacemaker.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ int pcmk_list_nodes(xmlNode **xml, const char *types);
295295
*/
296296
int pcmk_status(xmlNodePtr *xml);
297297

298+
// @COMPAT Change rule_ids to type const char *const * at a compatibility break
298299
/*!
299300
* \brief Check whether each rule in a list is in effect
300301
*

include/pcmki/pcmki_rule.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2024 the Pacemaker project contributors
2+
* Copyright 2022-2025 the Pacemaker project contributors
33
*
44
* The version control history for this file may have further details.
55
*
@@ -19,7 +19,7 @@ extern "C" {
1919
#endif
2020

2121
int pcmk__check_rules(pcmk__output_t *out, xmlNodePtr input,
22-
const crm_time_t *date_time, const char **rule_ids);
22+
const crm_time_t *date_time, const char *const *rule_ids);
2323

2424
/*!
2525
* \internal

lib/pacemaker/pcmk_rule.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ eval_rule(pcmk_scheduler_t *scheduler, const char *rule_id, const char **error)
161161
*/
162162
int
163163
pcmk__check_rules(pcmk__output_t *out, xmlNodePtr input, const crm_time_t *date,
164-
const char **rule_ids)
164+
const char *const *rule_ids)
165165
{
166166
pcmk_scheduler_t *scheduler = NULL;
167167
int rc = pcmk_rc_ok;
@@ -178,7 +178,7 @@ pcmk__check_rules(pcmk__output_t *out, xmlNodePtr input, const crm_time_t *date,
178178
return rc;
179179
}
180180

181-
for (const char **rule_id = rule_ids; *rule_id != NULL; rule_id++) {
181+
for (const char *const *rule_id = rule_ids; *rule_id != NULL; rule_id++) {
182182
const char *error = NULL;
183183
int last_rc = eval_rule(scheduler, *rule_id, &error);
184184

@@ -208,7 +208,7 @@ pcmk_check_rules(xmlNodePtr *xml, xmlNodePtr input, const crm_time_t *date,
208208

209209
pcmk__register_lib_messages(out);
210210

211-
rc = pcmk__check_rules(out, input, date, rule_ids);
211+
rc = pcmk__check_rules(out, input, date, (const char *const *) rule_ids);
212212
pcmk__xml_output_finish(out, pcmk_rc2exitc(rc), xml);
213213
return rc;
214214
}

tools/crm_rule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ main(int argc, char **argv)
201201
switch(options.mode) {
202202
case crm_rule_mode_check:
203203
rc = pcmk__check_rules(out, input, rule_date,
204-
(const char **) options.rules);
204+
(const char *const *) options.rules);
205205
exit_code = pcmk_rc2exitc(rc);
206206
break;
207207

0 commit comments

Comments
 (0)