From e4d51acf7d77e2c8d9a5924deefd4e53657397ea Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 11 Jan 2009 10:00:19 +0000 Subject: [PATCH] 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 --- CHANGES | 1 + lib/access.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index a0529258..684ce0b7 100644 --- a/CHANGES +++ b/CHANGES @@ -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) diff --git a/lib/access.c b/lib/access.c index 6fc24472..4e36df9a 100644 --- a/lib/access.c +++ b/lib/access.c @@ -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)))