Fix error propagation during expression evaluation.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5581 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2009-01-11 10:00:19 +00:00
1 parent 93aa7f3222
commit e4d51acf7d
2 files changed
+3 -4

No files matched your search

+1
View File
@@ -4,6 +4,7 @@ lm-sensors CHANGES file
SVN-HEAD
libsensors: Add support for instantaneous power sensors
Add support for current sensors
Fix error propagation during expression evaluation
maxilife scripts: Delete (driver never ported to Linux 2.6)
sensord: Accept negative temperatures in RRD database
Don't bail out on transient errors (#2330)
+2 -4
View File
@@ -437,10 +437,8 @@ int sensors_eval_expr(const sensors_chip_features *chip_features,
if (!(subfeature = sensors_lookup_subfeature_name(chip_features,
expr->data.var)))
return -SENSORS_ERR_NO_ENTRY;
if (!(res = sensors_get_value(&chip_features->chip,
subfeature->number, result)))
return res;
return 0;
return sensors_get_value(&chip_features->chip,
subfeature->number, result);
}
if ((res = sensors_eval_expr(chip_features, expr->data.subexpr.sub1,
val, &res1)))