Author: uwe Date: 2008-08-07 16:35:39 +0200 (Thu, 07 Aug 2008) New Revision: 3476
Modified: trunk/payloads/coreinfo/coreinfo.c trunk/payloads/coreinfo/lar_module.c Log: Cosmetic fixes (trivial).
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: trunk/payloads/coreinfo/coreinfo.c =================================================================== --- trunk/payloads/coreinfo/coreinfo.c 2008-08-07 10:32:54 UTC (rev 3475) +++ trunk/payloads/coreinfo/coreinfo.c 2008-08-07 14:35:39 UTC (rev 3476) @@ -77,9 +77,7 @@ } };
-static WINDOW *modwin; -static WINDOW *menuwin; - +static WINDOW *modwin, *menuwin; static int curwin;
void print_module_title(WINDOW *win, const char *title) @@ -90,7 +88,6 @@ mvwprintw(win, 0, 1, title);
wmove(win, 1, 1); - for (i = 0; i < 78; i++) waddch(win, '\304'); } @@ -110,7 +107,8 @@ return;
for (i = 0; i < cat->count; i++) - ptr += sprintf(ptr, "[%c: %s] ", 'A' + i, cat->modules[i]->name); + ptr += sprintf(ptr, "[%c: %s] ", 'A' + i, + cat->modules[i]->name);
mvwprintw(menuwin, 0, 0, menu); } @@ -126,7 +124,7 @@ rtc_read_clock(&tm);
mvwprintw(menuwin, 0, 57, "%02d/%02d/%04d - %02d:%02d:%02d", - tm.tm_mon, tm.tm_mday, 1900+tm.tm_year, tm.tm_hour, + tm.tm_mon, tm.tm_mday, 1900 + tm.tm_year, tm.tm_hour, tm.tm_min, tm.tm_sec); } #endif @@ -138,7 +136,6 @@ char *ptr = menu;
wmove(menuwin, 1, 0); - for (j = 0; j < SCREEN_X; j++) waddch(menuwin, ' ');
@@ -158,11 +155,9 @@
static void center(int row, const char *str) { - int len = strlen(str); - int j; + int j, len = strlen(str);
wmove(stdscr, row, 0); - for (j = 0; j < SCREEN_X; j++) waddch(stdscr, ' ');
@@ -283,7 +278,6 @@
for (i = 0; i < SCREEN_Y - 1; i++) { wmove(modwin, i - 1, 0); - for (j = 0; j < SCREEN_X; j++) waddch(modwin, ' '); } @@ -293,7 +287,6 @@ for (i = 0; i < ARRAY_SIZE(categories); i++) { for (j = 0; j < categories[i].count; j++) categories[i].modules[j]->init(); - }
loop();
Modified: trunk/payloads/coreinfo/lar_module.c =================================================================== --- trunk/payloads/coreinfo/lar_module.c 2008-08-07 10:32:54 UTC (rev 3475) +++ trunk/payloads/coreinfo/lar_module.c 2008-08-07 14:35:39 UTC (rev 3476) @@ -60,7 +60,7 @@ print_module_title(win, "LAR Listing");
if (lar == 0) { - mvwprintw(win, 11, 61 / 2, "Bad or missing LAR"); + mvwprintw(win, 11, 61 / 2, "Bad or missing LAR"); return 0; }