Changeset 4989

Timestamp:

10/25/07 11:52:46 (6 years ago)

Author:

khali

Message:

Make the configuration file optional. Although in most cases it's not
very useful to use libsensors without a configuration file, I fail to
see the rationale for making a configuration file mandatory.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• lib/init.c (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -5 +5 @@
   libsensors: Add a default configuration file
               Fix memory leaks on initialization error
+              Make the configuration file optional
   sensord: Reload config on SIGHUP rather than automatically
            No default configuration file name

lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

@@ -50 +50 @@
                 /* No configuration provided, use default */
                 input = fopen(DEFAULT_CONFIG_FILE, "r");
-                if (!input)
-                        goto exit_cleanup;
-                if (sensors_scanner_init(input) ||
-                    sensors_yyparse()) {
+                if (input) {
+                        if (sensors_scanner_init(input) ||
+                            sensors_yyparse()) {
+                                fclose(input);
+                                goto exit_cleanup;
+                        }
                         fclose(input);
-                        goto exit_cleanup;
                 }
-                fclose(input);
         }