Changeset 5252

Timestamp:

05/12/08 13:51:18 (2 months ago)

Author:

khali

Message:

Fix support of multiple chip names on the command line. It got broken
accidentally during the conversion to the new libsensors API in version
3.0.0. This closes ticket #2321.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/CHANGES (modified) (2 diffs)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c (modified) (1 diff)

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

@@ -9 +9 @@
-              Support virtual hwmon devices (#2309)
-              Support power and energy sensors
+              Support DOS-style configuration files again (#2284)
-  pwmconfig: Don't create the configuration file before it's needed
-             Don't preserve configuration file customizations
@@ -15 +16 @@
-  fancontrol: Don't start if already running (#2299)
-              Delete fancontrol.pid at exit time (#2299)
+  sensord: Fix support of multiple chip names on the command line (#2321)
-  sensors: Print energy and power sensors with automatically scaled units
-  sensors-detect: Add SMSC SCH5027D detection

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

@@ -137 +137 @@
-(FeatureFN fn, void *data) {
-  const sensors_chip_name *chip;
- = 0
+
-
-  for (j = 0; (ret == 0) && (j < numChipNames); ++ j) {
+    i = 0;
-    while ((ret == 0) && ((chip = sensors_get_detected_chips (&chipNames[j], &i)) != NULL)) {
-      int index0, chipindex = -1;

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c

@@ -171 +171 @@
-(int action) {
-  const sensors_chip_name *chip;
- = 0
+
-
-  for (j = 0; (ret == 0) && (j < numChipNames); ++ j) {
+    i = 0;
-    while ((ret == 0) && ((chip = sensors_get_detected_chips (&chipNames[j], &i)) != NULL)) {
-      ret = doChip (chip, action);