mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-18 19:30:54 +00:00
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:
1 parent
93aa7f3222
commit
e4d51acf7d
2 files changed
+3
-4
No files matched your search
@@ -4,6 +4,7 @@ lm-sensors CHANGES file
|
|||||||
SVN-HEAD
|
SVN-HEAD
|
||||||
libsensors: Add support for instantaneous power sensors
|
libsensors: Add support for instantaneous power sensors
|
||||||
Add support for current sensors
|
Add support for current sensors
|
||||||
|
Fix error propagation during expression evaluation
|
||||||
maxilife scripts: Delete (driver never ported to Linux 2.6)
|
maxilife scripts: Delete (driver never ported to Linux 2.6)
|
||||||
sensord: Accept negative temperatures in RRD database
|
sensord: Accept negative temperatures in RRD database
|
||||||
Don't bail out on transient errors (#2330)
|
Don't bail out on transient errors (#2330)
|
||||||
|
|||||||
+2
-4
@@ -437,10 +437,8 @@ int sensors_eval_expr(const sensors_chip_features *chip_features,
|
|||||||
if (!(subfeature = sensors_lookup_subfeature_name(chip_features,
|
if (!(subfeature = sensors_lookup_subfeature_name(chip_features,
|
||||||
expr->data.var)))
|
expr->data.var)))
|
||||||
return -SENSORS_ERR_NO_ENTRY;
|
return -SENSORS_ERR_NO_ENTRY;
|
||||||
if (!(res = sensors_get_value(&chip_features->chip,
|
return sensors_get_value(&chip_features->chip,
|
||||||
subfeature->number, result)))
|
subfeature->number, result);
|
||||||
return res;
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
if ((res = sensors_eval_expr(chip_features, expr->data.subexpr.sub1,
|
if ((res = sensors_eval_expr(chip_features, expr->data.subexpr.sub1,
|
||||||
val, &res1)))
|
val, &res1)))
|
||||||
|
|||||||
Reference in new issue
Block a user