File pacemaker#3600-0002-Log-scheduler-correct-format-arguments.patch of Package pacemaker.36842
From b9c4207a441694412fa50512c6f155f67273a494 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Tue, 6 Aug 2024 09:45:29 -0500
Subject: [PATCH 2/2] Log: scheduler: correct format arguments
---
lib/common/rules.c | 4 ++--
lib/pacemaker/pcmk_sched_colocation.c | 2 +-
lib/pacemaker/pcmk_sched_tickets.c | 2 +-
lib/pacemaker/pcmk_sched_utilization.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
Index: pacemaker-2.1.7+20231219.0f7f88312/lib/pacemaker/pcmk_sched_colocation.c
===================================================================
--- pacemaker-2.1.7+20231219.0f7f88312.orig/lib/pacemaker/pcmk_sched_colocation.c
+++ pacemaker-2.1.7+20231219.0f7f88312/lib/pacemaker/pcmk_sched_colocation.c
@@ -786,7 +786,7 @@ unpack_simple_colocation(xmlNode *xml_ob
if (primary == NULL) {
pcmk__config_warn("Ignoring constraint '%s' because resource '%s' "
"does not have an instance '%s'",
- "'%s'", id, primary_id, primary_instance);
+ id, primary_id, primary_instance);
return;
}
}
Index: pacemaker-2.1.7+20231219.0f7f88312/lib/pacemaker/pcmk_sched_tickets.c
===================================================================
--- pacemaker-2.1.7+20231219.0f7f88312.orig/lib/pacemaker/pcmk_sched_tickets.c
+++ pacemaker-2.1.7+20231219.0f7f88312/lib/pacemaker/pcmk_sched_tickets.c
@@ -345,7 +345,7 @@ unpack_simple_rsc_ticket(xmlNode *xml_ob
if (rsc == NULL) {
pcmk__config_warn("Ignoring constraint '%s' because resource '%s' "
"does not have an instance '%s'",
- "'%s'", id, rsc_id, instance);
+ id, rsc_id, instance);
return;
}
}
Index: pacemaker-2.1.7+20231219.0f7f88312/lib/pacemaker/pcmk_sched_utilization.c
===================================================================
--- pacemaker-2.1.7+20231219.0f7f88312.orig/lib/pacemaker/pcmk_sched_utilization.c
+++ pacemaker-2.1.7+20231219.0f7f88312/lib/pacemaker/pcmk_sched_utilization.c
@@ -31,7 +31,8 @@ utilization_value(const char *s)
int value = 0;
if ((s != NULL) && (pcmk__scan_min_int(s, &value, INT_MIN) == EINVAL)) {
- pe_warn("Using 0 for utilization instead of invalid value '%s'", value);
+ pcmk__config_warn("Using 0 for utilization instead of "
+ "invalid value '%s'", s);
value = 0;
}
return value;