Changeset 5628

Timestamp:

01/28/09 14:16:17 (4 years ago)

Author:

khali

Message:

Consistently use "err" as the variable name to carry error codes.

Files:

• lm-sensors/trunk/prog/sensors/main.c (modified) (9 diffs)

lm-sensors/trunk/prog/sensors/main.c

@@ -176 +176 @@
 static int do_a_set(const sensors_chip_name *name)
 {
-        int res;
-
-        if ((res = sensors_do_chip_sets(name))) {
-                if (res == -SENSORS_ERR_KERNEL) {
+        int err;
+
+        if ((err = sensors_do_chip_sets(name))) {
+                if (err == -SENSORS_ERR_KERNEL) {
                         fprintf(stderr, "%s: %s;\n",
                                 sprintf_chip_name(name),
-                                sensors_strerror(res));
+                                sensors_strerror(err));
                         fprintf(stderr, "Run as root?\n");
                         return 1;
-                } else if (res == -SENSORS_ERR_ACCESS_W) {
+                } else if (err == -SENSORS_ERR_ACCESS_W) {
                         fprintf(stderr,
                                 "%s: At least one \"set\" statement failed\n",
@@ -191 +191 @@
                 } else {
                         fprintf(stderr, "%s: %s\n", sprintf_chip_name(name),
-                                sensors_strerror(res));
+                                sensors_strerror(err));
                 }
         }
@@ -198 +198 @@
 
 /* returns number of chips found */
-static int do_the_real_work(const sensors_chip_name *match, int *error)
+static int do_the_real_work(const sensors_chip_name *match, int *err)
 {
         const sensors_chip_name *chip;
@@ -208 +208 @@
                 if (do_sets) {
                         if (do_a_set(chip))
-                                *error = 1;
+                                *err = 1;
                 } else
                         do_a_print(chip);
@@ -244 +244 @@
 int main(int argc, char *argv[])
 {
-        int c, res, i, error = 0, do_bus_list;
+        int c, i, err, do_bus_list;
         const char *config_file_name = NULL;
 
@@ -304 +304 @@
         }
 
-        res = read_config_file(config_file_name);
-        if (res)
-                exit(res);
+        err = read_config_file(config_file_name);
+        if (err)
+                exit(err);
 
         /* build the degrees string */
@@ -314 +314 @@
                 print_bus_list();
         } else if (optind == argc) { /* No chip name on command line */
-                if (!do_the_real_work(NULL, &error)) {
+                if (!do_the_real_work(NULL, &err)) {
                         fprintf(stderr,
                                 "No sensors found!\n"
                                 "Make sure you loaded all the kernel drivers you need.\n"
                                 "Try sensors-detect to find out which these are.\n");
-                        error = 1;
+                        err = 1;
                 }
         } else {
@@ -331 +331 @@
                                         argv[i]);
                                 print_short_help();
-                                error = 1;
+                                err = 1;
                                 goto exit;
                         }
-                        cnt += do_the_real_work(&chip, &error);
+                        cnt += do_the_real_work(&chip, &err);
                 }
 
                 if (!cnt) {
                         fprintf(stderr, "Specified sensor(s) not found!\n");
-                        error = 1;
+                        err = 1;
                 }
         }
@@ -345 +345 @@
 exit:
         sensors_cleanup();
-        exit(error);
-}
+        exit(err);
+}