Changeset 5722

Timestamp:

05/13/09 18:09:06 (4 years ago)

Author:

andy

Message:

sensord: This patch does some refactoring of the loadConfig()
function.

* Simplifying the conditions makes code flow clearer and eliminates
long lines (> 80 chars).
* Removed useless stat() call.
* Return -1 in error case, instead of several positive values (never defined).

Location:

lm-sensors/trunk/prog/sensord

Files:

• lib.c (modified) (2 diffs)
• sensord.c (modified) (1 diff)

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

@@ -22 +22 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -35 +36 @@
 static int loadConfig(const char *cfgPath, int reload)
 {
-        struct stat stats;
-        FILE *cfg = NULL;
-        int ret = 0;
+        int ret;
+        FILE *fp;
 
-        if (cfgPath && !strcmp(cfgPath, "-")) {
-                if (!reload) {
-                        if ((ret = sensors_init(stdin))) {
-                                sensorLog(LOG_ERR,
-                                          "Error loading sensors configuration file <stdin>: %s",
-                                          sensors_strerror(ret));
-                                ret = 12;
-                        }
-                }
-        } else if (cfgPath && stat(cfgPath, &stats) < 0) {
-                sensorLog(LOG_ERR,
-                          "Error stating sensors configuration file: %s",
-                          cfgPath);
-                ret = 10;
-        } else {
-                if (reload) {
+        /* Load default configuration. */
+        if (!cfgPath) {
+                if (reload) {
                         sensorLog(LOG_INFO, "configuration reloading");
                         sensors_cleanup();
                 }
-                if (cfgPath && !(cfg = fopen(cfgPath, "r"))) {
-                        sensorLog(LOG_ERR,
-                                  "Error opening sensors configuration file: %s",
-                                  cfgPath);
-                        ret = 11;
-                } else if ((ret = sensors_init(cfg))) {
-                        sensorLog(LOG_ERR,
-                                  "Error loading sensors configuration file %s: %s",
-                                  cfgPath ? cfgPath : "(default)",
-                                  sensors_strerror(ret));
-                        ret = 11;
-                }
-                if (cfg)
-                        fclose(cfg);
+
+                ret = sensors_init(NULL);
+                if (ret) {
+                        sensorLog(LOG_ERR, "Error loading default"
+                                  " configuration file: %s",
+                                  sensors_strerror(ret));
+                        return -1;
+                }
+                return 0;
+        }
+
+        fp = fopen(cfgPath, "r");
+        if (!fp) {
+                sensorLog(LOG_ERR, "Error opening config file %s: %s",
+                          strerror(errno));
+                return -1;
+        }
+
+        if (reload) {
+                sensorLog(LOG_INFO, "configuration reloading");
+                sensors_cleanup();
         }
+        ret = sensors_init(fp);
+        if (ret) {
+                sensorLog(LOG_ERR, "Error loading sensors configuration file"
+                          " %s: %s", cfgPath, sensors_strerror(ret));
+                fclose(fp);
+                return -1;
+        }
+        fclose(fp);
 
-        return ret;
+        return 0;
 }
 

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

@@ -94 +94 @@
                         ret = reloadLib(sensord_args.cfgFile);
                         if (ret)
-                                sensorLog(LOG_NOTICE,
-                                          "config reload error (%d)", ret);
+                                sensorLog(LOG_NOTICE, "configuration reload"
+                                          " error");
                         reload = 0;
                 }