Changeset 4711

Timestamp:

08/26/07 15:21:05 (6 years ago)

Author:

khali

Message:

config_file doesn't need to be a global. Also move the handling of
the configuration file in a single separate function for clarity.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c (modified) (3 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

@@ -39 +39 @@
 #define VERSION                 LM_VERSION
 #define DEFAULT_CONFIG_FILE     ETCDIR "/sensors.conf"
-
-FILE *config_file;
 
 extern int main(int argc, char *arv[]);
@@ -90 +88 @@
 }
 
-/* This examines global var config_file, and leaves the name there too.
-   It also opens config_file. */
-static void open_config_file(const char* config_file_name)
-{
-        if (!strcmp(config_file_name, "-")) {
+/* Return 0 on success, and an exit error code otherwise */
+static int read_config_file(const char *config_file_name)
+{
+        FILE *config_file;
+        int err;
+
+        if (!strcmp(config_file_name, "-"))
                 config_file = stdin;
-                return;
-        }
-
-        config_file = fopen(config_file_name, "r");
+        else
+                config_file = fopen(config_file_name, "r");
+
         if (!config_file) {
                 fprintf(stderr, "Could not open config file\n");
                 perror(config_file_name);
-                exit(1);
-        }
-}
-
-static void close_config_file(const char* config_file_name)
-{
-        if (fclose(config_file) == EOF) {
-                fprintf(stderr, "Could not close config file\n");
+                return 1;
+        }
+
+        err = sensors_init(config_file);
+        if (err) {
+                fprintf(stderr, "sensors_init: %s\n", sensors_strerror(err));
+                return 1;
+        }
+
+        if (fclose(config_file) == EOF)
                 perror(config_file_name);
-        }
+
+        return 0;
 }
 
@@ -200 +202 @@
         }
 
-        open_config_file(config_file_name);
-        if ((res = sensors_init(config_file))) {
-                fprintf(stderr, "sensors_init: %s\n", sensors_strerror(res));
-                exit(1);
-        }
-        close_config_file(config_file_name);
+        res = read_config_file(config_file_name);
+        if (res)
+                exit(res);
 
         /* build the degrees string */