Changeset 933 for trunk/dmi.c

Timestamp:

03/13/10 18:28:29 (2 years ago)

Author:

uwe

Message:

Various coding style and cosmetic changes (trivial).

• Fix coding-style, whitespace, and indentation in a few places.

• Consistently use the same spelling ("Super I/O") everywhere.

• Make some flashrom stdout output look a bit nicer.

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

File:

• trunk/dmi.c (modified) (9 diffs)

trunk/dmi.c

@@ -32 +32 @@
         DMI_BB_PRODUCT,
         DMI_BB_VERSION,
-        DMI_ID_INVALID /* This must always be the last entry */
+        DMI_ID_INVALID, /* This must always be the last entry! */
 };
 
-/* The short_id for baseboard starts with "m" as in mainboard to leave
-   "b" available for BIOS */
+/*
+ * The short_id for baseboard starts with "m" as in mainboard to leave
+ * "b" available for BIOS.
+ */
 const char *dmidecode_names[DMI_ID_INVALID] = {
         "system-manufacturer",
@@ -43 +45 @@
         "baseboard-manufacturer",
         "baseboard-product-name",
-        "baseboard-version"
+        "baseboard-version",
 };
 
@@ -52 +54 @@
 char *dmistrings[DMI_ID_INVALID];
 
-/* strings longer than 4096 in DMI are just insane */
+/* Strings longer than 4096 in DMI are just insane. */
 #define DMI_MAX_ANSWER_LEN 4096
 
@@ -60 +62 @@
         char *result;
         char answerbuf[DMI_MAX_ANSWER_LEN];
-        char commandline[DMI_COMMAND_LEN_MAX+40];
+        char commandline[DMI_COMMAND_LEN_MAX + 40];
+
         snprintf(commandline, sizeof(commandline),
                  "%s -s %s", dmidecode_command, string_name);
@@ -83 +86 @@
         }
 
-        /* chomp trailing newline */
+        /* Chomp trailing newline. */
         if (answerbuf[0] != 0 &&
             answerbuf[strlen(answerbuf) - 1] == '\n')
@@ -100 +103 @@
         int i;
         char *chassis_type;
+
         has_dmi_support = 1;
         for (i = 0; i < DMI_ID_INVALID; i++) {
@@ -132 +136 @@
         int anchored = 0;
         int patternlen;
+
         printf_debug("matching %s against %s\n", value, pattern);
-        /* The empty string is part of all strings */
+        /* The empty string is part of all strings! */
         if (pattern[0] == 0)
                 return 1;
@@ -146 +151 @@
                 int valuelen = strlen(value);
                 patternlen--;
-                if(patternlen > valuelen)
+                if (patternlen > valuelen)
                         return 0;
 
                 /* full string match: require same length */
-                if(anchored && (valuelen != patternlen))
+                if (anchored && (valuelen != patternlen))
                         return 0;
 
@@ -167 +172 @@
 {
         int i;
+
         if (!has_dmi_support)
                 return 0;
 
-        for (i = 0;i < DMI_ID_INVALID; i++)
-                if(dmi_compare(dmistrings[i], pattern))
+        for (i = 0; i < DMI_ID_INVALID; i++)
+                if (dmi_compare(dmistrings[i], pattern))
                         return 1;