From 0deb5145c336bc4b32766c6f7af259d643af9143 Mon Sep 17 00:00:00 2001

From: Chris Lumens <clumens@redhat.com>

Date: Wed, 28 Oct 2020 13:56:09 -0400

Subject: [PATCH 1/2] Fix: scheduler, tools: Update typing on maint-mode args.

---

 lib/pengine/pe_output.c | 2 +-

 tools/crm_mon_curses.c  | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c

index 186be33..d0f96f4 100644

--- a/lib/pengine/pe_output.c

+++ b/lib/pengine/pe_output.c

@@ -686,7 +686,7 @@ pe__cluster_dc_xml(pcmk__output_t *out, va_list args) {

     return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("maint-mode", "unsigned long long")

+PCMK__OUTPUT_ARGS("maint-mode", "unsigned long long int")

 int

 pe__cluster_maint_mode_text(pcmk__output_t *out, va_list args) {

     unsigned long long flags = va_arg(args, unsigned long long);

diff --git a/tools/crm_mon_curses.c b/tools/crm_mon_curses.c

index 8a08578..9cf28dc 100644

--- a/tools/crm_mon_curses.c

+++ b/tools/crm_mon_curses.c

@@ -365,7 +365,7 @@ stonith_event_console(pcmk__output_t *out, va_list args) {

     return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("maint-mode", "unsigned long long")

+PCMK__OUTPUT_ARGS("maint-mode", "unsigned long long int")

 static int

 cluster_maint_mode_console(pcmk__output_t *out, va_list args) {

     unsigned long long flags = va_arg(args, unsigned long long);

-- 

1.8.3.1

From 7a61ae2384b0a1653b4a06926b4ec23099ccf292 Mon Sep 17 00:00:00 2001

From: Chris Lumens <clumens@redhat.com>

Date: Wed, 28 Oct 2020 13:57:51 -0400

Subject: [PATCH 2/2] Fix: tools: Update typing on formatted output args in

 crmadmin.

A lot of these are actually taking const char * as an argument, not

regular char *.

---

 tools/crmadmin.c | 62 ++++++++++++++++++++++++++++----------------------------

 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/tools/crmadmin.c b/tools/crmadmin.c

index b80a31a..e61dbf4 100644

--- a/tools/crmadmin.c

+++ b/tools/crmadmin.c

@@ -167,14 +167,14 @@ command_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError

     return TRUE;

 }

-PCMK__OUTPUT_ARGS("health", "char *", "char *", "char *", "char *")

+PCMK__OUTPUT_ARGS("health", "const char *", "const char *", "const char *", "const char *")

 static int

 health_text(pcmk__output_t *out, va_list args)

 {

-    char *sys_from = va_arg(args, char *);

-    char *host_from = va_arg(args, char *);

-    char *fsa_state = va_arg(args, char *);

-    char *result = va_arg(args, char *);

+    const char *sys_from = va_arg(args, const char *);

+    const char *host_from = va_arg(args, const char *);

+    const char *fsa_state = va_arg(args, const char *);

+    const char *result = va_arg(args, const char *);

     if (!out->is_quiet(out)) {

         out->info(out, "Status of %s@%s: %s (%s)", crm_str(sys_from),

@@ -186,14 +186,14 @@ health_text(pcmk__output_t *out, va_list args)

     return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("health", "char *", "char *", "char *", "char *")

+PCMK__OUTPUT_ARGS("health", "const char *", "const char *", "const char *", "const char *")

 static int

 health_xml(pcmk__output_t *out, va_list args)

 {

-    char *sys_from = va_arg(args, char *);

-    char *host_from = va_arg(args, char *);

-    char *fsa_state = va_arg(args, char *);

-    char *result = va_arg(args, char *);

+    const char *sys_from = va_arg(args, const char *);

+    const char *host_from = va_arg(args, const char *);

+    const char *fsa_state = va_arg(args, const char *);

+    const char *result = va_arg(args, const char *);

     xmlNodePtr node = pcmk__output_create_xml_node(out, crm_str(sys_from));

     xmlSetProp(node, (pcmkXmlStr) "node_name", (pcmkXmlStr) crm_str(host_from));

@@ -203,13 +203,13 @@ health_xml(pcmk__output_t *out, va_list args)

     return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("pacemakerd-health", "char *", "char *", "char *")

+PCMK__OUTPUT_ARGS("pacemakerd-health", "const char *", "const char *", "const char *")

 static int

 pacemakerd_health_text(pcmk__output_t *out, va_list args)

 {

-    char *sys_from = va_arg(args, char *);

-    char *state = va_arg(args, char *);

-    char *last_updated = va_arg(args, char *);

+    const char *sys_from = va_arg(args, const char *);

+    const char *state = va_arg(args, const char *);

+    const char *last_updated = va_arg(args, const char *);

     if (!out->is_quiet(out)) {

         out->info(out, "Status of %s: '%s' %s %s", crm_str(sys_from),

@@ -222,13 +222,13 @@ pacemakerd_health_text(pcmk__output_t *out, va_list args)

     return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("pacemakerd-health", "char *", "char *", "char *")

+PCMK__OUTPUT_ARGS("pacemakerd-health", "const char *", "const char *", "const char *")

 static int

 pacemakerd_health_xml(pcmk__output_t *out, va_list args)

 {

-    char *sys_from = va_arg(args, char *);

-    char *state = va_arg(args, char *);

-    char *last_updated = va_arg(args, char *);

+    const char *sys_from = va_arg(args, const char *);

+    const char *state = va_arg(args, const char *);

+    const char *last_updated = va_arg(args, const char *);

     xmlNodePtr node = pcmk__output_create_xml_node(out, crm_str(sys_from));

@@ -238,11 +238,11 @@ pacemakerd_health_xml(pcmk__output_t *out, va_list args)

     return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("dc", "char *")

+PCMK__OUTPUT_ARGS("dc", "const char *")

 static int

 dc_text(pcmk__output_t *out, va_list args)

 {

-    char *dc = va_arg(args, char *);

+    const char *dc = va_arg(args, const char *);

     if (!out->is_quiet(out)) {

         out->info(out, "Designated Controller is: %s", crm_str(dc));

@@ -253,11 +253,11 @@ dc_text(pcmk__output_t *out, va_list args)

     return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("dc", "char *")

+PCMK__OUTPUT_ARGS("dc", "const char *")

 static int

 dc_xml(pcmk__output_t *out, va_list args)

 {

-    char *dc = va_arg(args, char *);

+    const char *dc = va_arg(args, const char *);

     xmlNodePtr node = pcmk__output_create_xml_node(out, "dc");

     xmlSetProp(node, (pcmkXmlStr) "node_name", (pcmkXmlStr) crm_str(dc));

@@ -266,7 +266,7 @@ dc_xml(pcmk__output_t *out, va_list args)

 }

-PCMK__OUTPUT_ARGS("crmadmin-node-list", "xmlNode *")

+PCMK__OUTPUT_ARGS("crmadmin-node-list", "struct xmlNode *")

 static int

 crmadmin_node_list(pcmk__output_t *out, va_list args)

 {

@@ -298,13 +298,13 @@ crmadmin_node_list(pcmk__output_t *out, va_list args)

     return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("crmadmin-node", "char *", "char *", "char *")

+PCMK__OUTPUT_ARGS("crmadmin-node", "const char *", "const char *", "const char *")

 static int

 crmadmin_node_text(pcmk__output_t *out, va_list args)

 {

-        char *type = va_arg(args, char *);

-        char *name = va_arg(args, char *);

-        char *id = va_arg(args, char *);

+        const char *type = va_arg(args, const char *);

+        const char *name = va_arg(args, const char *);

+        const char *id = va_arg(args, const char *);

         if (BASH_EXPORT) {

             out->info(out, "export %s=%s", crm_str(name), crm_str(id));

@@ -316,13 +316,13 @@ crmadmin_node_text(pcmk__output_t *out, va_list args)

         return pcmk_rc_ok;

 }

-PCMK__OUTPUT_ARGS("crmadmin-node", "char *", "char *", "char *")

+PCMK__OUTPUT_ARGS("crmadmin-node", "const char *", "const char *", "const char *")

 static int

 crmadmin_node_xml(pcmk__output_t *out, va_list args)

 {

-    char *type = va_arg(args, char *);

-    char *name = va_arg(args, char *);

-    char *id = va_arg(args, char *);

+    const char *type = va_arg(args, const char *);

+    const char *name = va_arg(args, const char *);

+    const char *id = va_arg(args, const char *);

     xmlNodePtr node = pcmk__output_create_xml_node(out, "node");

     xmlSetProp(node, (pcmkXmlStr) "type", (pcmkXmlStr) (type ? type : "member"));

-- 

1.8.3.1