fixed idents on ci

src/smap/configure_functions.c

@@ -53,7 +53,7 @@ void get_command(void)
 	error_code = slurm_load_node((time_t) NULL, &node_info_ptr, 0);
 	if (error_code)
 		if (quiet_flag != 1) {
-			clear_window(text_win);
+			wclear(text_win);
 			ycord = text_win->_maxy / 2;
 			mvwprintw(text_win, ycord, 1, "slurm_load_node");
 			return;
@@ -68,7 +68,7 @@ void get_command(void)
 		box(grid_win, 0, 0);
 		wrefresh(text_win);
 		wrefresh(grid_win);
-		clear_window(command_win);
+		wclear(command_win);
 		box(command_win, 0, 0);
 		mvwprintw(command_win, 0, 3,
 			  "Input Command: (type quit to change view, exit to exit)");
@@ -98,7 +98,7 @@ void get_command(void)
 	params.display = 0;
 	noecho();
 	init_grid(node_info_ptr);
-	clear_window(text_win);
+	wclear(text_win);
 	xcord = 1;
 	ycord = 1;
 	print_date();

src/smap/grid_functions.c

@@ -27,15 +27,6 @@
 
 #include "src/smap/smap.h"
 
-void clear_window(WINDOW * win)
-{
-	int x, y;
-	for (x = 1; x < win->_maxx; x++)
-		for (y = 1; y < win->_maxy; y++)
-			mvwaddch(win, y, x, ' ');
-	return;
-}
-
 /* _init_grid - set values of every grid point */
 void init_grid(node_info_msg_t * node_info_ptr)
 {

src/smap/job_functions.c

@@ -53,7 +53,7 @@ void get_job()
 
 	if (error_code)
 		if (quiet_flag != 1) {
-			clear_window(text_win);
+			wclear(text_win);
 			ycord = text_win->_maxy / 2;
 			xcord = text_win->_maxx;
 			mvwprintw(text_win, ycord, 1, "slurm_load_job");

src/smap/partition_functions.c

@@ -53,7 +53,7 @@ void get_part(void)
 		    slurm_load_partitions((time_t) NULL, &new_part_ptr, 0);
 	if (error_code) {
 		if (quiet_flag != 1) {
-			clear_window(text_win);
+			wclear(text_win);
 			ycord = text_win->_maxy / 2;
 			xcord = text_win->_maxx;
 			mvwprintw(text_win, ycord, 1,
@@ -191,24 +191,25 @@ int print_text_part(partition_info_t * part_ptr)
 	prefixlen = i;
 	while (nodes[i] != '\0') {
 		width = text_win->_maxx - xcord;
-		
-                if (!prefixlen && nodes[i] == '[' && nodes[i - 1] == ',')
+
+		if (!prefixlen && nodes[i] == '[' && nodes[i - 1] == ',')
 			prefixlen = i + 1;
-		
-                if (nodes[i-1] == ',' && (width - 10) <= 0) {
+
+		if (nodes[i - 1] == ',' && (width - 12) <= 0) {
 			ycord++;
 			xcord = tempxcord + prefixlen;
-		} else if(xcord>text_win->_maxx) {
-                	ycord++;
+		} else if (xcord > text_win->_maxx) {
+			ycord++;
 			xcord = tempxcord + prefixlen;
-                }
-                
-                  
-		if ((printed =  mvwaddch(text_win, ycord, xcord, nodes[i])) < 0)
-                  return printed;
+		}
+
+
+		if ((printed =
+		     mvwaddch(text_win, ycord, xcord, nodes[i])) < 0)
+			return printed;
 		xcord++;
-		
-                i++;
+
+		i++;
 	}
 
 	xcord = 1;

src/smap/smap.c

@@ -72,6 +72,7 @@ int main(int argc, char *argv[])
 	} else {
 		for (i = 0; i < node_info_ptr->record_count; i++) {
 			node_ptr = &node_info_ptr->node_array[i];
+			node_ptr->node_state = NODE_STATE_DRAINED;
 			start = atoi(node_ptr->name + 3);
 			temp = start / 100;
 			if (X < temp)
@@ -104,12 +105,12 @@ int main(int argc, char *argv[])
 
 
 	}
-        signal(SIGWINCH, _resize_handler);
+	signal(SIGWINCH, _resize_handler);
 #else
 	printf("This will only run on a BGL system right now.\n");
 	exit(0);
 #endif
-        initscr();
+	initscr();
 	if (COLS < (75 + width) || LINES < height) {
 		endwin();
 		printf
@@ -129,7 +130,7 @@ int main(int argc, char *argv[])
 	box(grid_win, 0, 0);
 
 	startx = width;
-        COLS -= 2;
+	COLS -= 2;
 	width = COLS - width;
 	height = LINES;
 	text_win = newwin(height, width, starty, startx);
@@ -139,12 +140,12 @@ int main(int argc, char *argv[])
 
 	while (!end) {
 		_get_option();
-	      redraw:		
-                
- 
-                init_grid(node_info_ptr);
+	      redraw:
+
+
+		init_grid(node_info_ptr);
 		wclear(text_win);
-                //wclear(grid_win);        
+		//wclear(grid_win);        
 		xcord = 1;
 		ycord = 1;
 
@@ -169,14 +170,14 @@ int main(int argc, char *argv[])
 
 		if (params.iterate) {
 			for (i = 0; i < params.iterate; i++) {
-                          
-                          sleep(1);
-                          if (_get_option())
-                            goto redraw;
-                          else if (resize_screen) {
-                            resize_screen=0;
-                            goto redraw;
-                          }
+
+				sleep(1);
+				if (_get_option())
+					goto redraw;
+				else if (resize_screen) {
+					resize_screen = 0;
+					goto redraw;
+				}
 			}
 		} else
 			break;
@@ -206,8 +207,8 @@ void print_date(void)
 int _get_option(void)
 {
 	char ch;
-	
-        ch = getch();
+
+	ch = getch();
 	switch (ch) {
 	case 'b':
 		params.display = BGLPART;
@@ -236,38 +237,38 @@ int _get_option(void)
 
 void *_resize_handler(int sig)
 {
- 	int height = Y * Z + Y * 2;
+	int height = Y * Z + Y * 2;
 	int width = X * 2;
 	int startx = 0;
 	int starty = 0;
-	
-        ycord=1;
-        wclear(grid_win);
-        wclear(text_win);
-        endwin();
-        initscr();
-        getmaxyx(stdscr,LINES,COLS);
-        wresize(grid_win,height,width);
-        width = COLS - width;
-	wresize(text_win,LINES,width);
-        print_date();
-        switch (params.display) {
-        case JOBS:
-          get_job();
-          break;
-        case COMMANDS:
-          get_command();
-          break;
-        default:
-          get_part();
-          break;
-        }
-        
-        print_grid();
-        box(text_win, 0, 0);
-        box(grid_win, 0, 0);
-        wrefresh(text_win);
-        wrefresh(grid_win);
-        resize_screen=1;
-        return NULL;
+
+	ycord = 1;
+	wclear(grid_win);
+	wclear(text_win);
+	endwin();
+	initscr();
+	getmaxyx(stdscr, LINES, COLS);
+	wresize(grid_win, height, width);
+	width = COLS - width;
+	wresize(text_win, LINES, width);
+	print_date();
+	switch (params.display) {
+	case JOBS:
+		get_job();
+		break;
+	case COMMANDS:
+		get_command();
+		break;
+	default:
+		get_part();
+		break;
+	}
+
+	print_grid();
+	box(text_win, 0, 0);
+	box(grid_win, 0, 0);
+	wrefresh(text_win);
+	wrefresh(grid_win);
+	resize_screen = 1;
+	return NULL;
 }

src/smap/smap.h

@@ -106,8 +106,6 @@ time_t now;
 axis ***grid;
 axis *fill_in_value;
 
-void clear_window(WINDOW * win);
-
 void init_grid(node_info_msg_t * node_info_ptr);
 int set_grid(int start, int end, int count);
 int set_grid_bgl(int startx, int starty, int startz, int endx, int endy,