diff --git a/src/scontrol/update_job.c b/src/scontrol/update_job.c
index 98d0833c78fd248ab727abbd09517fa015ac7551..967f765650419937927cd95112e34608075f85be 100644
--- a/src/scontrol/update_job.c
+++ b/src/scontrol/update_job.c
@@ -69,7 +69,8 @@ scontrol_checkpoint(char *op, char *job_step_id_str, int argc, char *argv[])
if (job_step_id_str) {
job_id = (uint32_t) strtol (job_step_id_str, &next_str, 10);
if (next_str[0] == '.') {
- step_id = (uint32_t) strtol (&next_str[1], &next_str, 10);
+ step_id = (uint32_t) strtol (&next_str[1], &next_str,
+ 10);
step_id_set = 1;
} else
step_id = NO_VAL;
@@ -111,22 +112,25 @@ scontrol_checkpoint(char *op, char *job_step_id_str, int argc, char *argv[])
else if (strncasecmp(op, "enable", MAX(oplen, 2)) == 0)
rc = slurm_checkpoint_enable (job_id, step_id);
else if (strncasecmp(op, "create", MAX(oplen, 2)) == 0) {
- if (_parse_checkpoint_args(argc, argv, &max_wait, &image_dir)) {
+ if (_parse_checkpoint_args(argc, argv, &max_wait, &image_dir)){
return 0;
}
- rc = slurm_checkpoint_create (job_id, step_id, max_wait, image_dir);
+ rc = slurm_checkpoint_create (job_id, step_id, max_wait,
+ image_dir);
} else if (strncasecmp(op, "vacate", MAX(oplen, 2)) == 0) {
- if (_parse_checkpoint_args(argc, argv, &max_wait, &image_dir)) {
+ if (_parse_checkpoint_args(argc, argv, &max_wait, &image_dir)){
return 0;
}
- rc = slurm_checkpoint_vacate (job_id, step_id, max_wait, image_dir);
+ rc = slurm_checkpoint_vacate (job_id, step_id, max_wait,
+ image_dir);
} else if (strncasecmp(op, "restart", MAX(oplen, 2)) == 0) {
if (_parse_restart_args(argc, argv, &stick, &image_dir)) {
return 0;
}
- rc = slurm_checkpoint_restart (job_id, step_id, stick, image_dir);
+ rc = slurm_checkpoint_restart (job_id, step_id, stick,
+ image_dir);
} else if (strncasecmp(op, "error", MAX(oplen, 2)) == 0) {
rc = slurm_checkpoint_error (job_id, step_id,
@@ -276,7 +280,7 @@ scontrol_update_job (int argc, char *argv[])
taglen = val - argv[i];
val++;
vallen = strlen(val);
- } else if (strncasecmp(tag, "Nice", MAX(strlen(tag), 2)) == 0) {
+ } else if (strncasecmp(tag, "Nice", MAX(strlen(tag), 2)) == 0){
/* "Nice" is the only tag that might not have an
equal sign, so it is handled specially. */
job_msg.nice = NICE_OFFSET + 100;
@@ -317,7 +321,8 @@ scontrol_update_job (int argc, char *argv[])
nice = strtoll(val, (char **) NULL, 10);
if (abs(nice) > NICE_OFFSET) {
error("Invalid nice value, must be between "
- "-%d and %d", NICE_OFFSET, NICE_OFFSET);
+ "-%d and %d", NICE_OFFSET,
+ NICE_OFFSET);
exit_code = 1;
return 0;
}
@@ -451,11 +456,11 @@ scontrol_update_job (int argc, char *argv[])
(char **) NULL, 10);
update_cnt++;
}
- else if (strncasecmp(tag, "ExcNodeList", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp(tag, "ExcNodeList", MAX(taglen, 1)) == 0){
job_msg.exc_nodes = val;
update_cnt++;
}
- else if (strncasecmp(tag, "ReqNodeList", MAX(taglen, 8)) == 0) {
+ else if (strncasecmp(tag, "ReqNodeList", MAX(taglen, 8)) == 0){
job_msg.req_nodes = val;
update_cnt++;
}
@@ -536,7 +541,8 @@ scontrol_update_job (int argc, char *argv[])
}
else {
exit_code = 1;
- fprintf (stderr, "Invalid input: %s\n", argv[i]);
+ fprintf (stderr, "Update of this parameter is not "
+ "supported: %s\n", argv[i]);
fprintf (stderr, "Request aborted\n");
return 0;
}
diff --git a/src/scontrol/update_node.c b/src/scontrol/update_node.c
index 44454db0a942496ff1e421425c4ca5157df3cf8e..beeb579deb3308a7c57a6a5d4601a355878a0000 100644
--- a/src/scontrol/update_node.c
+++ b/src/scontrol/update_node.c
@@ -172,7 +172,7 @@ scontrol_update_node (int argc, char *argv[])
for (j = 0; j < NODE_STATE_END; j++) {
if (strncasecmp (node_state_string(j),
val,
- MAX(vallen, 3)) == 0) {
+ MAX(vallen, 3)) == 0){
state_val = (uint16_t) j;
break;
}
@@ -202,7 +202,8 @@ scontrol_update_node (int argc, char *argv[])
}
} else {
exit_code = 1;
- fprintf (stderr, "Invalid input: %s\n", argv[i]);
+ fprintf (stderr, "Update of this parameter is not "
+ "supported: %s\n", argv[i]);
fprintf (stderr, "Request aborted\n");
goto done;
}
diff --git a/src/scontrol/update_part.c b/src/scontrol/update_part.c
index dddb971e1c03e8bf6acb59d0b9a40f691d310eff..4d6e71c65ee2835e812c9b39ae23299f208985fb 100644
--- a/src/scontrol/update_part.c
+++ b/src/scontrol/update_part.c
@@ -86,7 +86,7 @@ scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
part_msg_ptr->max_time = max_time;
(*update_cnt_ptr)++;
}
- else if (strncasecmp(tag, "DefaultTime", MAX(taglen, 8)) == 0) {
+ else if (strncasecmp(tag, "DefaultTime", MAX(taglen, 8)) == 0){
int default_time = time_str2mins(val);
if ((default_time < 0) && (default_time != INFINITE)) {
exit_code = 1;
@@ -166,23 +166,29 @@ scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
if (strncasecmp(val, "NO", MAX(vallen, 1)) == 0) {
part_msg_ptr->max_share = 1;
- } else if (strncasecmp(val, "EXCLUSIVE", MAX(vallen, 1)) == 0) {
+ } else if (strncasecmp(val, "EXCLUSIVE",
+ MAX(vallen, 1)) == 0) {
part_msg_ptr->max_share = 0;
- } else if (strncasecmp(val, "YES", MAX(vallen, 1)) == 0) {
+ } else if (strncasecmp(val, "YES", MAX(vallen, 1))
+ == 0) {
if (colon_pos) {
- part_msg_ptr->max_share = (uint16_t) strtol(colon_pos+1,
- (char **) NULL, 10);
+ part_msg_ptr->max_share =
+ (uint16_t) strtol(colon_pos+1,
+ (char **) NULL, 10);
} else {
part_msg_ptr->max_share = (uint16_t) 4;
}
- } else if (strncasecmp(val, "FORCE", MAX(vallen, 1)) == 0) {
+ } else if (strncasecmp(val, "FORCE", MAX(vallen, 1))
+ == 0) {
if (colon_pos) {
- part_msg_ptr->max_share = (uint16_t) strtol(colon_pos+1,
- (char **) NULL, 10) | SHARED_FORCE;
+ part_msg_ptr->max_share =
+ (uint16_t) strtol(colon_pos+1,
+ (char **) NULL, 10) |
+ SHARED_FORCE;
} else {
- part_msg_ptr->max_share = (uint16_t) 4 |
- SHARED_FORCE;
+ part_msg_ptr->max_share =
+ (uint16_t) 4 |SHARED_FORCE;
}
} else {
exit_code = 1;
@@ -216,7 +222,7 @@ scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
part_msg_ptr->nodes = val;
(*update_cnt_ptr)++;
}
- else if (strncasecmp(tag, "AllowGroups", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp(tag, "AllowGroups", MAX(taglen, 1)) == 0){
part_msg_ptr->allow_groups = val;
(*update_cnt_ptr)++;
}
@@ -226,7 +232,8 @@ scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
}
else {
exit_code = 1;
- error("Invalid input: %s", argv[i]);
+ error("Update of this parameter is not "
+ "supported: %s\n", argv[i]);
error("Request aborted");
return -1;
}