BLUEGENE - moved function from one place to another to access from the

common .la for the block allocator

src/plugins/select/bluegene/ba_common.c

@@ -1614,3 +1614,21 @@ extern char *ba_passthroughs_string(uint16_t passthrough)
 	return pass;
 }
 
+/* This is defined here so we can get it on non-bluegene systems since
+ * it is needed in pack/unpack functions, and bluegene.c isn't
+ * compiled for non-bluegene machines, and it didn't make since to
+ * compile the whole file just for this one function.
+ */
+extern char *give_geo(uint16_t *int_geo, int dims, bool with_sep)
+{
+	char *geo = NULL;
+	int i;
+
+	for (i=0; i<dims; i++) {
+		if (geo && with_sep)
+			xstrcat(geo, "x");
+		xstrfmtcat(geo, "%c", alpha_num[int_geo[i]]);
+	}
+	return geo;
+}
+

src/plugins/select/bluegene/ba_common.h

@@ -548,4 +548,6 @@ extern char *ba_set_ionode_str(bitstr_t *bitmap);
  * Caller MUST xfree() the returned value */
 extern char *ba_passthroughs_string(uint16_t passthrough);
 
+extern char *give_geo(uint16_t *int_geo, int dims, bool with_sep);
+
 #endif

src/plugins/select/bluegene/bg_node_info.c

@@ -126,24 +126,6 @@ unpack_error:
 	return SLURM_ERROR;
 }
 
-/* This is defined here so we can get it on non-bluegene systems since
- * it is needed in pack/unpack functions, and bluegene.c isn't
- * compiled for non-bluegene machines, and it didn't make since to
- * compile the whole file just for this one function.
- */
-extern char *give_geo(uint16_t *int_geo, int dims, bool with_sep)
-{
-	char *geo = NULL;
-	int i;
-
-	for (i=0; i<dims; i++) {
-		if (geo && with_sep)
-			xstrcat(geo, "x");
-		xstrfmtcat(geo, "%c", alpha_num[int_geo[i]]);
-	}
-	return geo;
-}
-
 extern int select_nodeinfo_pack(select_nodeinfo_t *nodeinfo, Buf buffer,
 				uint16_t protocol_version)
 {

src/plugins/select/bluegene/bg_node_info.h

@@ -59,8 +59,6 @@ struct select_nodeinfo {
 	List subgrp_list;
 };
 
-extern char *give_geo(uint16_t *int_geo, int dims, bool with_sep);
-
 extern int select_nodeinfo_pack(select_nodeinfo_t *nodeinfo, Buf buffer,
 				uint16_t protocol_version);