Changeset 5175

Timestamp:

04/11/08 22:41:31 (5 years ago)

Author:

khali

Message:

We start at the end of the chip list, going backwards, and we want the
late compute statements to override the early ones (as documented in the
sensors.conf manual page), so we must stop as soon as any match is found.

This fixes Debian bug #474596:
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=474596

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• lib/access.c (modified) (2 diffs)

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

@@ -5 +5 @@
   libsensors: Use __func__ instead of __FUNCTION__
               Parse the configuration file in C locale
+              Late compute statements override early ones
   sensors-detect: Add SMSC SCH5027D detection
                   Do not access I/O ports on PPC

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

@@ -250 +250 @@
 
                 chip = NULL;
-                while ((chip = sensors_for_all_config_chips(name, chip)))
+                while (!expr &&
+                       (chip = sensors_for_all_config_chips(name, chip)))
                         for (i = 0; i < chip->computes_count; i++) {
                                 if (!strcmp(feature->name,
@@ -301 +302 @@
 
                 chip = NULL;
-                while ((chip = sensors_for_all_config_chips(name, chip)))
+                while (!expr &&
+                       (chip = sensors_for_all_config_chips(name, chip)))
                         for (i = 0; i < chip->computes_count; i++) {
                                 if (!strcmp(feature->name,