Changeset 5252

Show
Ignore:
Timestamp:
05/12/08 13:51:18 (6 years 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.

Location:
lm-sensors/branches/lm-sensors-3.0.0
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/branches/lm-sensors-3.0.0/CHANGES

    r5249 r5252  
    99              Support virtual hwmon devices (#2309) 
    1010              Support power and energy sensors 
     11              Support DOS-style configuration files again (#2284) 
    1112  pwmconfig: Don't create the configuration file before it's needed 
    1213             Don't preserve configuration file customizations 
     
    1516  fancontrol: Don't start if already running (#2299) 
    1617              Delete fancontrol.pid at exit time (#2299) 
     18  sensord: Fix support of multiple chip names on the command line (#2321) 
    1719  sensors: Print energy and power sensors with automatically scaled units 
    1820  sensors-detect: Add SMSC SCH5027D detection 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

    r5163 r5252  
    137137(FeatureFN fn, void *data) { 
    138138  const sensors_chip_name *chip; 
    139   int i = 0, j, ret = 0, num = 0; 
     139  int i, j, ret = 0, num = 0; 
    140140 
    141141  for (j = 0; (ret == 0) && (j < numChipNames); ++ j) { 
     142    i = 0; 
    142143    while ((ret == 0) && ((chip = sensors_get_detected_chips (&chipNames[j], &i)) != NULL)) { 
    143144      int index0, chipindex = -1; 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c

    r5163 r5252  
    171171(int action) { 
    172172  const sensors_chip_name *chip; 
    173   int i = 0, j, ret = 0; 
     173  int i, j, ret = 0; 
    174174 
    175175  for (j = 0; (ret == 0) && (j < numChipNames); ++ j) { 
     176    i = 0; 
    176177    while ((ret == 0) && ((chip = sensors_get_detected_chips (&chipNames[j], &i)) != NULL)) { 
    177178      ret = doChip (chip, action);