From 2a04e55574bc47edaaae09a3ba16a145efb4be94 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Sun, 17 Oct 2010 23:05:47 +0000
Subject: [PATCH] 09_job_info_alloc_void.diff patch from Geritt: select: make
argument of select_p_select_jobinfo_alloc() consistent
This explicitly declares the argument list of select_p_select_jobinfo_alloc()
to be 'void', to avoid misinterpreting it as an old-style definition:
* node_select.h already defines select_g_select_jobinfo_alloc(void);
* the cons_res variant erroneously specified 'select_jobinfo_t *jobinfo';
* explicit argument list makes bug tracking easier.
---
src/common/node_select.c | 2 +-
src/common/node_select.h | 2 +-
src/plugins/select/bgq/select_bgq.cc | 2 +-
src/plugins/select/bluegene/plugin/select_bluegene.c | 2 +-
src/plugins/select/cons_res/select_cons_res.c | 2 +-
src/plugins/select/cray/other_select.c | 2 +-
src/plugins/select/cray/select_cray.c | 2 +-
src/plugins/select/linear/select_linear.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/common/node_select.c b/src/common/node_select.c
index fab4f2a7308..13e2f8d769d 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -739,7 +739,7 @@ extern int select_g_select_nodeinfo_get(dynamic_plugin_data_t *nodeinfo,
(nodedata, dinfo, state, data);
}
-extern dynamic_plugin_data_t *select_g_select_jobinfo_alloc()
+extern dynamic_plugin_data_t *select_g_select_jobinfo_alloc(void)
{
dynamic_plugin_data_t *jobinfo_ptr = NULL;
uint32_t plugin_id;
diff --git a/src/common/node_select.h b/src/common/node_select.h
index b04fd5a9d9f..85dc3556266 100644
--- a/src/common/node_select.h
+++ b/src/common/node_select.h
@@ -106,7 +106,7 @@ typedef struct slurm_select_ops {
select_nodedata_type dinfo,
enum node_states state,
void *data);
- select_jobinfo_t *(*jobinfo_alloc) ();
+ select_jobinfo_t *(*jobinfo_alloc) (void);
int (*jobinfo_free) (select_jobinfo_t *jobinfo);
int (*jobinfo_set) (select_jobinfo_t *jobinfo,
enum
diff --git a/src/plugins/select/bgq/select_bgq.cc b/src/plugins/select/bgq/select_bgq.cc
index be3bdbc3a9c..bab9704ae41 100644
--- a/src/plugins/select/bgq/select_bgq.cc
+++ b/src/plugins/select/bgq/select_bgq.cc
@@ -306,7 +306,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
return SLURM_SUCCESS;
}
-select_jobinfo_t *select_p_select_jobinfo_alloc()
+select_jobinfo_t *select_p_select_jobinfo_alloc(void)
{
return SLURM_SUCCESS;
}
diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c
index 26cb2f9a448..db5afbbfedb 100644
--- a/src/plugins/select/bluegene/plugin/select_bluegene.c
+++ b/src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -693,7 +693,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
return select_nodeinfo_get(nodeinfo, dinfo, state, data);
}
-select_jobinfo_t *select_p_select_jobinfo_alloc()
+select_jobinfo_t *select_p_select_jobinfo_alloc(void)
{
return alloc_select_jobinfo();
}
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index ef847f48a16..b906ee9f0bf 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -2077,7 +2077,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
return rc;
}
-extern int select_p_select_jobinfo_alloc (select_jobinfo_t *jobinfo)
+extern int select_p_select_jobinfo_alloc(void)
{
return SLURM_SUCCESS;
}
diff --git a/src/plugins/select/cray/other_select.c b/src/plugins/select/cray/other_select.c
index fb1d0c921ca..33f79feb90d 100644
--- a/src/plugins/select/cray/other_select.c
+++ b/src/plugins/select/cray/other_select.c
@@ -510,7 +510,7 @@ extern int other_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
(nodeinfo, dinfo, state, data);
}
-extern select_jobinfo_t *other_select_jobinfo_alloc()
+extern select_jobinfo_t *other_select_jobinfo_alloc(void)
{
if (other_select_init() < 0)
return NULL;
diff --git a/src/plugins/select/cray/select_cray.c b/src/plugins/select/cray/select_cray.c
index f46141e824b..946c7573203 100644
--- a/src/plugins/select/cray/select_cray.c
+++ b/src/plugins/select/cray/select_cray.c
@@ -367,7 +367,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
return rc;
}
-extern select_jobinfo_t *select_p_select_jobinfo_alloc()
+extern select_jobinfo_t *select_p_select_jobinfo_alloc(void)
{
select_jobinfo_t *jobinfo = xmalloc(sizeof(struct select_jobinfo));
jobinfo->magic = JOBINFO_MAGIC;
diff --git a/src/plugins/select/linear/select_linear.c b/src/plugins/select/linear/select_linear.c
index aeeed3e87ae..8b12c3af813 100644
--- a/src/plugins/select/linear/select_linear.c
+++ b/src/plugins/select/linear/select_linear.c
@@ -2743,7 +2743,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
return rc;
}
-extern select_jobinfo_t *select_p_select_jobinfo_alloc()
+extern select_jobinfo_t *select_p_select_jobinfo_alloc(void)
{
return SLURM_SUCCESS;
}
--
GitLab