Remove trailing spaces and fixes compiler warning.

doc/man/man1/salloc.1

@@ -319,7 +319,7 @@ Not supported unless the entire node is allocated to the job.
 Bind by setting CPU masks on tasks as specified
 where <list> is <mask1>,<mask2>,...<maskN>.
 CPU masks are \fBalways\fR interpreted as hexadecimal values but can be
-preceded with an optional '0x'. Not supported unless the entire node is 
+preceded with an optional '0x'. Not supported unless the entire node is
 allocated to the job.
 .TP
 .B sockets

doc/man/man1/sbatch.1

@@ -340,7 +340,7 @@ Not supported unless the entire node is allocated to the job.
 Bind by setting CPU masks on tasks as specified
 where <list> is <mask1>,<mask2>,...<maskN>.
 CPU masks are \fBalways\fR interpreted as hexadecimal values but can be
-preceded with an optional '0x'. Not supported unless the entire node is 
+preceded with an optional '0x'. Not supported unless the entire node is
 allocated to the job.
 .TP
 .B sockets

doc/man/man1/srun.1

@@ -316,11 +316,11 @@ Not supported unless the entire node is allocated to the job.
 Bind by setting CPU masks on tasks as specified
 where <list> is <mask1>,<mask2>,...<maskN>.
 CPU masks are \fBalways\fR interpreted as hexadecimal values but can be
-preceded with an optional '0x'. Not supported unless the entire node is 
+preceded with an optional '0x'. Not supported unless the entire node is
 allocated to the job.
 .TP
 .B rank_ldom
-Bind to a NUMA locality domain by rank. Not supported unless the entire 
+Bind to a NUMA locality domain by rank. Not supported unless the entire
 node is allocated to the job.
 .TP
 .B map_ldom:<list>

doc/man/man5/cgroup.conf.5

@@ -96,7 +96,7 @@ Also see \fBAllowedSwapSpace\fR, \fBAllowedRAMSpace\fR and
 .TP
 \fBConstrainSwapSpace\fR=<yes|no>
 If configured to "yes" then constrain the job's swap space usage.
-The default value is "no". Note that when set to "yes" and 
+The default value is "no". Note that when set to "yes" and
 ConstrainRAMSpace is set to "no", AllowedRAMSpace is automatically set
 to 100% in order to limit the RAM+Swap amount to 100% of job's requirement
 plus the percent of allowed swap space. This amount is thus set to both

src/plugins/task/cgroup/task_cgroup_cpuset.c

@@ -41,6 +41,7 @@
 #endif
 
 #define _GNU_SOURCE
+#include <ctype.h>
 #include <sched.h>
 #include <sys/types.h>
 
@@ -49,7 +50,7 @@
 #include "src/slurmd/slurmstepd/slurmstepd_job.h"
 #include "src/slurmd/slurmd/slurmd.h"
 #include "src/common/cpu_frequency.h"
-
+#include "src/common/slurm_resource_info.h"
 #include "src/common/bitstring.h"
 #include "src/common/xstring.h"
 #include "src/common/xcgroup_read_config.h"
@@ -1093,7 +1094,6 @@ extern int task_cgroup_cpuset_set_task_affinity(stepd_step_rec_t *job)
 	return fstatus;
 
 #else
-	char *avail_mask;
 	char mstr[1 + CPU_SETSIZE / 4];
 	cpu_bind_type_t bind_type;
 	cpu_set_t ts;
@@ -1263,7 +1263,7 @@ extern int task_cgroup_cpuset_set_task_affinity(stepd_step_rec_t *job)
 					job);
 			tssize = sizeof(cpu_set_t);
 			fstatus = SLURM_SUCCESS;
-			if (rc = sched_setaffinity(pid, tssize, &ts)) {
+			if ((rc = sched_setaffinity(pid, tssize, &ts))) {
 				error("task/cgroup: task[%u] unable to set "
 					"mask 0x%s", taskid,
 					cpuset_to_str(&ts, mstr));
@@ -1340,7 +1340,7 @@ extern int task_cgroup_cpuset_set_task_affinity(stepd_step_rec_t *job)
 		if (hwloc_cpuset_to_glibc_sched_affinity(topology,cpuset,
 							 &ts,tssize) == 0) {
 			fstatus = SLURM_SUCCESS;
-			if (rc = sched_setaffinity(pid,tssize,&ts)) {
+			if ((rc = sched_setaffinity(pid,tssize,&ts))) {
 				error("task/cgroup: task[%u] unable to set "
 				      "taskset '%s'",taskid,str);
 				fstatus = SLURM_ERROR;