|
 |
951ecb |
From 1307b6f238fb7f4cada95f6af02c1a4caae3eb63 Mon Sep 17 00:00:00 2001
|
|
|
951ecb |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
951ecb |
Date: Fri, 3 Aug 2018 18:30:47 -0500
|
|
|
951ecb |
Subject: [PATCH 1/2] Refactor: scheduler: remove unused variable setting
|
|
|
951ecb |
|
|
|
951ecb |
makes static analysis happy
|
|
|
951ecb |
---
|
|
|
951ecb |
lib/pengine/container.c | 1 -
|
|
|
951ecb |
1 file changed, 1 deletion(-)
|
|
|
951ecb |
|
|
|
951ecb |
diff --git a/lib/pengine/container.c b/lib/pengine/container.c
|
|
|
951ecb |
index d82948a..1526f37 100644
|
|
|
951ecb |
--- a/lib/pengine/container.c
|
|
|
951ecb |
+++ b/lib/pengine/container.c
|
|
|
951ecb |
@@ -780,7 +780,6 @@ container_fix_remote_addr(resource_t *rsc)
|
|
|
951ecb |
}
|
|
|
951ecb |
|
|
|
951ecb |
for (int lpc = 0; lpc < DIMOF(attr_list); lpc++) {
|
|
|
951ecb |
- name = attr_list[lpc];
|
|
|
951ecb |
value = crm_element_value(rsc->xml, attr_list[lpc]);
|
|
|
951ecb |
if (safe_str_eq(value, value_list[lpc]) == FALSE) {
|
|
|
951ecb |
return FALSE;
|
|
|
951ecb |
--
|
|
|
951ecb |
1.8.3.1
|
|
|
951ecb |
|
|
|
951ecb |
|
|
|
951ecb |
From 1a95cbae653df8835906314d77e74091f55ab319 Mon Sep 17 00:00:00 2001
|
|
|
951ecb |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
951ecb |
Date: Fri, 3 Aug 2018 18:32:08 -0500
|
|
|
951ecb |
Subject: [PATCH 2/2] Refactor: libcrmcommon: remove dead code
|
|
|
951ecb |
|
|
|
951ecb |
makes static analysis happy
|
|
|
951ecb |
---
|
|
|
951ecb |
lib/common/iso8601.c | 6 +++---
|
|
|
951ecb |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
951ecb |
|
|
|
951ecb |
diff --git a/lib/common/iso8601.c b/lib/common/iso8601.c
|
|
|
951ecb |
index c95fa13..b661fce 100644
|
|
|
951ecb |
--- a/lib/common/iso8601.c
|
|
|
951ecb |
+++ b/lib/common/iso8601.c
|
|
|
951ecb |
@@ -1384,7 +1384,7 @@ crm_time_format_hr(const char *format, crm_time_hr_t * hr_dt)
|
|
|
951ecb |
{
|
|
|
951ecb |
const char *mark_s;
|
|
|
951ecb |
int max = 128, scanned_pos = 0, printed_pos = 0, fmt_pos = 0,
|
|
|
951ecb |
- date_len = 0, nano_digits = 0, fmt_len;
|
|
|
951ecb |
+ date_len = 0, nano_digits = 0;
|
|
|
951ecb |
char nano_s[10], date_s[max+1], nanofmt_s[5] = "%", *tmp_fmt_s;
|
|
|
951ecb |
struct tm tm;
|
|
|
951ecb |
crm_time_t dt;
|
|
|
951ecb |
@@ -1397,11 +1397,11 @@ crm_time_format_hr(const char *format, crm_time_hr_t * hr_dt)
|
|
|
951ecb |
sprintf(nano_s, "%06d000", hr_dt->useconds);
|
|
|
951ecb |
|
|
|
951ecb |
while ((format[scanned_pos]) != '\0') {
|
|
|
951ecb |
- fmt_len = 0;
|
|
|
951ecb |
mark_s = strchr(&format[scanned_pos], '%');
|
|
|
951ecb |
if (mark_s) {
|
|
|
951ecb |
+ int fmt_len = 1;
|
|
|
951ecb |
+
|
|
|
951ecb |
fmt_pos = mark_s - format;
|
|
|
951ecb |
- fmt_len = 1;
|
|
|
951ecb |
while ((format[fmt_pos+fmt_len] != '\0') &&
|
|
|
951ecb |
(format[fmt_pos+fmt_len] >= '0') &&
|
|
|
951ecb |
(format[fmt_pos+fmt_len] <= '9')) {
|
|
|
951ecb |
--
|
|
|
951ecb |
1.8.3.1
|
|
|
951ecb |
|