From 562c503a0323dc25b46947f98e7f88840d8fd8d8 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 10 Nov 2010 22:11:17 +0000
Subject: [PATCH] Purely cosmetic mods
---
src/common/slurm_priority.c | 6 +++---
src/common/slurm_priority.h | 2 +-
src/plugins/priority/basic/priority_basic.c | 2 +-
.../priority/multifactor/priority_multifactor.c | 12 +++++++-----
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/common/slurm_priority.c b/src/common/slurm_priority.c
index b586362fc0e..e3c399a61df 100644
--- a/src/common/slurm_priority.c
+++ b/src/common/slurm_priority.c
@@ -44,10 +44,10 @@
typedef struct slurm_priority_ops {
uint32_t (*set) (uint32_t last_prio,
struct job_record *job_ptr);
- void (*reconfig) ();
+ void (*reconfig) (void);
void (*set_assoc_usage)(slurmdb_association_rec_t *assoc);
List (*get_priority_factors)
- (priority_factors_request_msg_t *req_msg);
+ (priority_factors_request_msg_t *req_msg);
} slurm_priority_ops_t;
@@ -244,7 +244,7 @@ extern uint32_t priority_g_set(uint32_t last_prio, struct job_record *job_ptr)
return (*(g_priority_context->ops.set))(last_prio, job_ptr);
}
-extern void priority_g_reconfig()
+extern void priority_g_reconfig(void)
{
if (slurm_priority_init() < 0)
return;
diff --git a/src/common/slurm_priority.h b/src/common/slurm_priority.h
index 6e0baa9f98d..ac8ad21f52f 100644
--- a/src/common/slurm_priority.h
+++ b/src/common/slurm_priority.h
@@ -55,7 +55,7 @@
extern int slurm_priority_init(void);
extern int slurm_priority_fini(void);
extern uint32_t priority_g_set(uint32_t last_prio, struct job_record *job_ptr);
-extern void priority_g_reconfig();
+extern void priority_g_reconfig(void);
/* sets up the normalized usage and the effective usage of an
* association.
diff --git a/src/plugins/priority/basic/priority_basic.c b/src/plugins/priority/basic/priority_basic.c
index 549053a3e44..7ac5f858986 100644
--- a/src/plugins/priority/basic/priority_basic.c
+++ b/src/plugins/priority/basic/priority_basic.c
@@ -123,7 +123,7 @@ extern uint32_t priority_p_set(uint32_t last_prio, struct job_record *job_ptr)
return new_prio;
}
-extern void priority_p_reconfig()
+extern void priority_p_reconfig(void)
{
return;
diff --git a/src/plugins/priority/multifactor/priority_multifactor.c b/src/plugins/priority/multifactor/priority_multifactor.c
index 1d81ad28bb8..34e2b05ea7b 100644
--- a/src/plugins/priority/multifactor/priority_multifactor.c
+++ b/src/plugins/priority/multifactor/priority_multifactor.c
@@ -1042,7 +1042,7 @@ extern uint32_t priority_p_set(uint32_t last_prio, struct job_record *job_ptr)
return priority;
}
-extern void priority_p_reconfig()
+extern void priority_p_reconfig(void)
{
reconfig = 1;
_internal_setup();
@@ -1141,23 +1141,25 @@ extern List priority_p_get_priority_factors_list(
ret_list = list_create(slurm_destroy_priority_factors_object);
lock_slurmctld(job_read_lock);
itr = list_iterator_create(job_list);
+ if (itr == NULL)
+ fatal("list_iterator_create: malloc failure");
while ((job_ptr = list_next(itr))) {
/*
* We are only looking for pending jobs
*/
- if(!IS_JOB_PENDING(job_ptr))
+ if (!IS_JOB_PENDING(job_ptr))
continue;
/*
* This means the job is not eligible yet
*/
- if(!job_ptr->details->begin_time
- || (job_ptr->details->begin_time > start_time))
+ if (!job_ptr->details->begin_time
+ || (job_ptr->details->begin_time > start_time))
continue;
/*
* 0 means the job is held; 1 means system hold
*/
- if(job_ptr->priority <= 1)
+ if (job_ptr->priority <= 1)
continue;
if (_filter_job(job_ptr, req_job_list, req_user_list))
--
GitLab