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


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5175 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2008-04-11 20:41:31 +00:00
1 parent 7566fa5b1c
commit c84fd9820e
2 files changed
+5 -2

No files matched your search

+1
View File
@@ -4,6 +4,7 @@ lm-sensors CHANGES file
SVN-HEAD
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
Move south bridge sensor detection to the right section
+4 -2
View File
@@ -249,7 +249,8 @@ int sensors_get_value(const sensors_chip_name *name, int subfeat_nr,
subfeature->mapping);
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,
chip->computes[i].name)) {
@@ -300,7 +301,8 @@ int sensors_set_value(const sensors_chip_name *name, int subfeat_nr,
subfeature->mapping);
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,
chip->computes[i].name)) {