From c2893d2310b25af001c2179f746c3c92ed6e3589 Mon Sep 17 00:00:00 2001 From: Danny Auble <da@llnl.gov> Date: Mon, 1 Nov 2010 20:00:29 +0000 Subject: [PATCH] fixes for warnings on real bluegene system --- .../select/bluegene/block_allocator/block_allocator.c | 5 +++-- src/plugins/select/bluegene/plugin/bg_switch_connections.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c index c623eac352c..546220b761c 100644 --- a/src/plugins/select/bluegene/block_allocator/block_allocator.c +++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c @@ -2164,8 +2164,9 @@ extern char *find_bp_rack_mid(char* xyz) ba_bp_map_t *bp_map = NULL; ListIterator itr; int number; - uint16_t coord[cluster_dims]; - uint16_t len = strlen(xyz); + int coord[cluster_dims]; + int len = strlen(xyz); + len -= 3; if(len<0) return NULL; diff --git a/src/plugins/select/bluegene/plugin/bg_switch_connections.c b/src/plugins/select/bluegene/plugin/bg_switch_connections.c index 290b18b0c82..bd8c979ce21 100644 --- a/src/plugins/select/bluegene/plugin/bg_switch_connections.c +++ b/src/plugins/select/bluegene/plugin/bg_switch_connections.c @@ -43,7 +43,7 @@ #ifdef HAVE_BG_FILES static int _get_bp_by_location(my_bluegene_t* my_bg, - int* curr_coord, + uint16_t* curr_coord, rm_BP_t** bp); static int _get_switches_by_bpid(my_bluegene_t* my_bg, const char *bpid, rm_switch_t **curr_switch); @@ -60,7 +60,7 @@ static int _used_switches(ba_node_t *ba_node); * "NextBP" goes to, but we don't know, so we have to do this. */ #ifdef HAVE_BG_FILES -static int _get_bp_by_location(my_bluegene_t* my_bg, int* curr_coord, +static int _get_bp_by_location(my_bluegene_t* my_bg, uint16_t* curr_coord, rm_BP_t** bp) { static int bp_num = 0; -- GitLab