From 1aa3c7230c7df66fbbcf9867c1672f70f0fae55d Mon Sep 17 00:00:00 2001
From: Tim Wickberg <tim@schedmd.com>
Date: Fri, 14 Oct 2016 10:02:00 -0400
Subject: [PATCH] Revert "Remove reference to function removed in v17.02"
This reverts commit 8bc8e7e6f3142ec0f905af994e30912e2b62d34b.
---
.../knl_generic/node_features_knl_generic.c | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/plugins/node_features/knl_generic/node_features_knl_generic.c b/src/plugins/node_features/knl_generic/node_features_knl_generic.c
index d97c0a35969..ca7524a0360 100644
--- a/src/plugins/node_features/knl_generic/node_features_knl_generic.c
+++ b/src/plugins/node_features/knl_generic/node_features_knl_generic.c
@@ -57,6 +57,7 @@
#include "src/common/pack.h"
#include "src/common/parse_config.h"
#include "src/common/slurm_protocol_api.h"
+#include "src/common/slurm_strcasestr.h"
#include "src/common/timers.h"
#include "src/common/uid.h"
#include "src/common/xmalloc.h"
@@ -750,23 +751,23 @@ extern void node_features_p_node_state(char **avail_modes, char **current_mode)
cur_sep = ",";
}
}
- if (resp_msg && strcasestr(resp_msg, "All2All")) {
+ if (slurm_strcasestr(resp_msg, "All2All")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "a2a");
avail_sep = ",";
}
- if (resp_msg && strcasestr(resp_msg, "Hemisphere")) {
+ if (slurm_strcasestr(resp_msg, "Hemisphere")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "hemi");
avail_sep = ",";
}
- if (resp_msg && strcasestr(resp_msg, "Quadrant")) {
+ if (slurm_strcasestr(resp_msg, "Quadrant")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "quad");
avail_sep = ",";
}
- if (resp_msg && strcasestr(resp_msg, "SNC-2")) {
+ if (slurm_strcasestr(resp_msg, "SNC-2")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "snc2");
avail_sep = ",";
}
- if (resp_msg && strcasestr(resp_msg, "SNC-4")) {
+ if (slurm_strcasestr(resp_msg, "SNC-4")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "snc4");
avail_sep = ",";
}
@@ -802,23 +803,23 @@ extern void node_features_p_node_state(char **avail_modes, char **current_mode)
xstrfmtcat(cur_state, "%s%s", cur_sep, "auto");
}
}
- if (resp_msg && strcasestr(resp_msg, "Cache")) {
+ if (slurm_strcasestr(resp_msg, "Cache")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "cache");
avail_sep = ",";
}
- if (resp_msg && strcasestr(resp_msg, "Flat")) {
+ if (slurm_strcasestr(resp_msg, "Flat")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "flat");
avail_sep = ",";
}
- if (resp_msg && strcasestr(resp_msg, "Hybrid")) {
+ if (slurm_strcasestr(resp_msg, "Hybrid")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "hybrid");
avail_sep = ",";
}
- if (resp_msg && strcasestr(resp_msg, "Equal")) {
+ if (slurm_strcasestr(resp_msg, "Equal")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "equal");
avail_sep = ",";
}
- if (resp_msg && strcasestr(resp_msg, "Auto")) {
+ if (slurm_strcasestr(resp_msg, "Auto")) {
xstrfmtcat(avail_states, "%s%s", avail_sep, "auto");
/* avail_sep = ","; CLANG error: Dead assignment */
}
--
GitLab