Changeset 5721

Timestamp:

05/13/09 18:07:50 (4 years ago)

Author:

andy

Message:

sensord: Did some refactoring in parseChips(). This fixes some deep indentation
levels.

Files:

• lm-sensors/trunk/prog/sensord/args.c (modified) (2 diffs)

lm-sensors/trunk/prog/sensord/args.c

@@ -232 +232 @@
 int parseChips(int argc, char **argv)
 {
-        if (optind == argc) {
+        int i, n = argc - optind, err;
+
+        if (n == 0) {
                 sensord_args.chipNames[0].prefix =
                         SENSORS_CHIP_NAME_PREFIX_ANY;
@@ -239 +241 @@
                 sensord_args.chipNames[0].addr = SENSORS_CHIP_NAME_ADDR_ANY;
                 sensord_args.numChipNames = 1;
-        } else {
-                int i, n = argc - optind, err;
-                if (n > MAX_CHIP_NAMES) {
-                        fprintf(stderr, "Too many chip names.\n");
+
+                return 0;
+        }
+
+        if (n > MAX_CHIP_NAMES) {
+                fprintf(stderr, "Too many chip names.\n");
+                return -1;
+        }
+        for (i = 0; i < n; ++i) {
+                char *arg = argv[optind + i];
+
+                err = sensors_parse_chip_name(arg, sensord_args.chipNames + i);
+                if (err) {
+                        fprintf(stderr, "Invalid chip name `%s': %s\n", arg,
+                                sensors_strerror(err));
                         return -1;
                 }
-                for (i = 0; i < n; ++ i) {
-                        char *arg = argv[optind + i];
-
-                        err = sensors_parse_chip_name(arg,
-                                                      sensord_args.chipNames +
-                                                      i);
-                        if (err) {
-                                fprintf(stderr,
-                                        "Invalid chip name `%s': %s\n", arg,
-                                        sensors_strerror(err));
-                                return -1;
-                        }
-                }
-                sensord_args.numChipNames = n;
-        }
+        }
+        sensord_args.numChipNames = n;
+
         return 0;
 }