From e43653b7fdd598dc5e72c0ebb5ce22d628c521d0 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 6 May 2014 13:13:40 -0700
Subject: [PATCH] Cosmetic changes
No change to logic
---
src/slurmd/slurmd/req.c | 13 ++++++-------
src/slurmd/slurmd/slurmd.c | 4 +++-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index 2bfd50dc716..b912095ce28 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -42,21 +42,20 @@
#endif
#include <fcntl.h>
+#include <grp.h>
#include <pthread.h>
#include <sched.h>
#include <signal.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/param.h> /* MAXPATHLEN */
#include <sys/poll.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/wait.h>
#include <sys/un.h>
+#include <sys/wait.h>
+#include <unistd.h>
#include <utime.h>
-#include <grp.h>
#include "src/common/cpu_frequency.h"
#include "src/common/env.h"
@@ -68,6 +67,7 @@
#include "src/common/log.h"
#include "src/common/macros.h"
#include "src/common/node_select.h"
+#include "src/common/plugstack.h"
#include "src/common/read_config.h"
#include "src/common/slurm_auth.h"
#include "src/common/slurm_cred.h"
@@ -81,11 +81,10 @@
#include "src/common/util-net.h"
#include "src/common/xstring.h"
#include "src/common/xmalloc.h"
-#include "src/common/plugstack.h"
#include "src/slurmd/slurmd/get_mach_stat.h"
-#include "src/slurmd/slurmd/slurmd.h"
#include "src/slurmd/slurmd/reverse_tree_math.h"
+#include "src/slurmd/slurmd/slurmd.h"
#include "src/slurmd/slurmd/xcpu.h"
#include "src/slurmd/common/job_container_plugin.h"
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 4915e8c35ee..0c34b1d08ba 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -1239,6 +1239,7 @@ _process_cmdline(int ac, char **av)
exit(0);
break;
case 'd':
+ xfree(conf->stepd_loc);
conf->stepd_loc = xstrdup(optarg);
break;
case 'D':
@@ -1287,9 +1288,10 @@ _process_cmdline(int ac, char **av)
* If slurmstepd path wasn't overridden by command line, set
* it to the default here:
*/
- if (!conf->stepd_loc)
+ if (!conf->stepd_loc) {
conf->stepd_loc =
xstrdup_printf("%s/sbin/slurmstepd", SLURM_PREFIX);
+ }
}
--
GitLab