From 32b663e7750b2767b70538d57a9443f482559619 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 7 Jul 2011 10:50:05 -0700
Subject: [PATCH] make init_wires() definition consistent
make the init_wires() definition and use consistent for BGL, BGP, and
BGQ systems. No argument is needed or used in any system.
---
src/plugins/select/bluegene/ba/block_allocator.c | 2 +-
src/plugins/select/bluegene/ba/block_allocator.h | 2 +-
src/plugins/select/bluegene/ba/wire_test.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/select/bluegene/ba/block_allocator.c b/src/plugins/select/bluegene/ba/block_allocator.c
index 951e6283a3b..0ad3bd6d028 100644
--- a/src/plugins/select/bluegene/ba/block_allocator.c
+++ b/src/plugins/select/bluegene/ba/block_allocator.c
@@ -581,7 +581,7 @@ extern void print_ba_request(select_ba_request_t* ba_request)
* If a real bluegene system, query the system and get all wiring
* information of the system.
*/
-extern void init_wires()
+extern void init_wires(void)
{
int x, y, z, i;
ba_mp_t *source = NULL;
diff --git a/src/plugins/select/bluegene/ba/block_allocator.h b/src/plugins/select/bluegene/ba/block_allocator.h
index 56c5d393513..9945da975f6 100644
--- a/src/plugins/select/bluegene/ba/block_allocator.h
+++ b/src/plugins/select/bluegene/ba/block_allocator.h
@@ -61,7 +61,7 @@ extern ba_mp_t ***ba_main_grid;
* If a real bluegene system, query the system and get all wiring
* information of the system.
*/
-extern void init_wires();
+extern void init_wires(void);
/*
* get the used wires for a block out of the database and return the
diff --git a/src/plugins/select/bluegene/ba/wire_test.c b/src/plugins/select/bluegene/ba/wire_test.c
index 58c2401172f..c669c482b9d 100644
--- a/src/plugins/select/bluegene/ba/wire_test.c
+++ b/src/plugins/select/bluegene/ba/wire_test.c
@@ -127,7 +127,7 @@ int main(int argc, char** argv)
slurm_conf_reinit(NULL);
ba_init(NULL, 1);
- init_wires(NULL);
+ init_wires();
/* [010x831] */
/* results = list_create(NULL); */
--
GitLab