Changeset 3427

Timestamp:

07/18/08 16:08:18 (3 months ago)

Author:

uwe

Message:

Random coding style fixes and simplifications (trivial).
This will even reduce the final payload size a bit.

Signed-off-by: Uwe Hermann <uwe@…>
Acked-by: Uwe Hermann <uwe@…>

Location:

trunk/payloads/coreinfo

Files:

• coreinfo.c (modified) (7 diffs)
• lar_module.c (modified) (9 diffs)

trunk/payloads/coreinfo/coreinfo.c

@@ -78 +78 @@
 };
 
-
 static WINDOW *modwin;
 static WINDOW *menuwin;
@@ -122 +121 @@
         struct tm tm;
 
-        while(nvram_updating())
+        while (nvram_updating())
                 mdelay(10);
 
@@ -128 +127 @@
 
         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_min, tm.tm_sec);
+                  tm.tm_mon, tm.tm_mday, 1900+tm.tm_year, tm.tm_hour,
+                  tm.tm_min, tm.tm_sec);
 }
 #endif
@@ -185 +184 @@
         ptr += sprintf(ptr, "[ %s ]", str);
 
-
-
         for (i = ((SCREEN_X - len) / 2) + len; i < SCREEN_X; i++)
                 ptr += sprintf(ptr, "=");
@@ -208 +205 @@
         if (key >= 'a' && key <= 'z') {
                 int index = key - 'a';
-
                 if (index < cat->count) {
-
-                cat->cur = index;
+                        cat->cur = index;
                         redraw_module(cat);
                         return;
@@ -297 +292 @@
 
         for (i = 0; i < ARRAY_SIZE(categories); i++) {
-                for(j = 0; j < categories[i].count; j++)
+                for (j = 0; j < categories[i].count; j++)
                         categories[i].modules[j]->init();
 
@@ -307 +302 @@
 }
 
-PAYLOAD_INFO(name,"coreinfo");
-PAYLOAD_INFO(listname,"System Information");
-PAYLOAD_INFO(desc,"Display information about the system");
+PAYLOAD_INFO(name, "coreinfo");
+PAYLOAD_INFO(listname, "System Information");
+PAYLOAD_INFO(desc, "Display information about the system");

trunk/payloads/coreinfo/lar_module.c

@@ -23 +23 @@
 
 static struct LAR *lar;
-static int lcount;
+static int lcount, selected;
 static char **lnames;
+static const char *compression_table[4] = {"none", "LZMA", "NRV2B", "zeroes"};
 
 static int lar_module_init(void)
@@ -36 +37 @@
                 return 0;
 
-        while((larent = readlar(lar)))
+        while ((larent = readlar(lar)))
                 lcount++;
 
@@ -46 +47 @@
         rewindlar(lar);
 
-        while((larent = readlar(lar)))
+        while ((larent = readlar(lar)))
                 lnames[index++] = strdup((const char *) larent->name);
 
@@ -52 +53 @@
 }
 
-static int selected;
-
 static int lar_module_redraw(WINDOW *win)
 {
-        int i;
-        int row = 2;
+        int i, row = 2;
         struct larstat stat;
 
@@ -63 +61 @@
 
         if (lar == 0) {
-                mvwprintw(win, 11, 61/2,  "Bad or missing LAR");
+                mvwprintw(win, 11, 61 / 2,  "Bad or missing LAR");
                 return 0;
         }
 
-        /* Draw a line down the middle */
+        /* Draw a line down the middle. */
+        for (i = 2; i < 21; i++)
+                mvwaddch(win, i, 30, '\263');
 
-        for(i = 2; i < 20; i++) {
-                wmove(win, i, 30);
-                waddch(win, '\263');
-        }
-
-        /* Draw the names down the left side */
-
-        for(i = 0; i < lcount; i++) {
+        /* Draw the names down the left side. */
+        for (i = 0; i < lcount; i++) {
                 if (i == selected)
                         wattrset(win, COLOR_PAIR(3) | A_BOLD);
@@ -85 +79 @@
         }
 
-        /* Get the information for the LAR */
-
+        /* Get the information for the LAR. */
         if (larstat(lar, lnames[selected], &stat)) {
                 printf("larstat failed\n");
@@ -97 +90 @@
 
         if (stat.compression) {
-                switch(stat.compression) {
-                case ALGO_LZMA:
-                        mvwprintw(win, row++, 32, "Compression: LZMA");
-                        break;
-                case ALGO_NRV2B:
-                        mvwprintw(win, row++, 32, "Compression: NRV2B");
-                        break;
-                case ALGO_ZEROES:
-                        mvwprintw(win, row++, 32, "Compression: zeroes");
-                        break;
-                }
-
+                mvwprintw(win, row++, 32, "Compression: %s",
+                          compression_table[stat.compression]);
                 mvwprintw(win, row++, 32, "Compressed length: %d", stat.len);
-                mvwprintw(win, row++, 32, "Compressed checksum: 0x%x", stat.compchecksum);
+                mvwprintw(win, row++, 32, "Compressed checksum: 0x%x",
+                          stat.compchecksum);
         }
 
         mvwprintw(win, row++, 32, "Length: %d", stat.reallen);
         mvwprintw(win, row++, 32, "Checksum: 0x%x", stat.checksum);
-        mvwprintw(win, row++, 32, "Load Address: 0x%llx", stat.loadaddress);
-        mvwprintw(win, row++, 32, "Entry Point: 0x%llx", stat.entry);
+        mvwprintw(win, row++, 32, "Load address: 0x%llx", stat.loadaddress);
+        mvwprintw(win, row++, 32, "Entry point: 0x%llx", stat.entry);
 
         return 0;
@@ -152 +136 @@
         .handle = lar_module_handle
 };
+
 #else
 
@@ -158 +143 @@
 
 #endif
-
-
-
-