Changeset 4839

Timestamp:

09/23/07 14:18:46 (6 years ago)

Author:

khali

Message:

We can plain skip the feature lookup and compute statement search for
subfeatures with no compute mapping.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/lib/access.c (modified) (4 diffs)

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -227 +227 @@
 {
         const sensors_subfeature *subfeature;
-        const sensors_feature *feature;
-        const sensors_chip *chip;
         const sensors_expr *expr = NULL;
         double val;
@@ -237 +235 @@
         if (!(subfeature = sensors_lookup_subfeature_nr(name, subfeat_nr)))
                 return -SENSORS_ERR_NO_ENTRY;
-
-        if (subfeature->flags & SENSORS_COMPUTE_MAPPING)
+        if (!(subfeature->flags & SENSORS_MODE_R))
+                return -SENSORS_ERR_ACCESS_R;
+
+        /* Apply compute statement if it exists */
+        if (subfeature->flags & SENSORS_COMPUTE_MAPPING) {
+                const sensors_feature *feature;
+                const sensors_chip *chip;
+
                 feature = sensors_lookup_feature_nr(name,
                                         subfeature->mapping);
-        else
-                feature = NULL;
-
-        if (!(subfeature->flags & SENSORS_MODE_R))
-                return -SENSORS_ERR_ACCESS_R;
-        for (chip = NULL;
-             !expr && (chip = sensors_for_all_config_chips(name, chip));)
-                for (i = 0; !expr && (i < chip->computes_count); i++) {
-                        if (feature && !strcmp(feature->name,
-                                               chip->computes[i].name)) {
-                                expr = chip->computes[i].from_proc;
+
+                chip = NULL;
+                while ((chip = sensors_for_all_config_chips(name, chip)))
+                        for (i = 0; i < chip->computes_count; i++) {
+                                if (!strcmp(feature->name,
+                                            chip->computes[i].name)) {
+                                        expr = chip->computes[i].from_proc;
+                                        break;
+                                }
                         }
-                }
+        }
+
         if (sensors_read_sysfs_attr(name, subfeat_nr, &val))
                 return -SENSORS_ERR_PROC;
@@ -270 +273 @@
 {
         const sensors_subfeature *subfeature;
-        const sensors_feature *feature;
-        const sensors_chip *chip;
         const sensors_expr *expr = NULL;
         int i, res;
@@ -280 +281 @@
         if (!(subfeature = sensors_lookup_subfeature_nr(name, subfeat_nr)))
                 return -SENSORS_ERR_NO_ENTRY;
-
-        if (subfeature->flags & SENSORS_COMPUTE_MAPPING)
+        if (!(subfeature->flags & SENSORS_MODE_W))
+                return -SENSORS_ERR_ACCESS_W;
+
+        /* Apply compute statement if it exists */
+        if (subfeature->flags & SENSORS_COMPUTE_MAPPING) {
+                const sensors_feature *feature;
+                const sensors_chip *chip;
+
                 feature = sensors_lookup_feature_nr(name,
                                         subfeature->mapping);
-        else
-                feature = NULL;
-
-        if (!(subfeature->flags & SENSORS_MODE_W))
-                return -SENSORS_ERR_ACCESS_W;
-        for (chip = NULL;
-             !expr && (chip = sensors_for_all_config_chips(name, chip));)
-                for (i = 0; !expr && (i < chip->computes_count); i++) {
-                        if (feature && !strcmp(feature->name,
-                                               chip->computes[i].name)) {
-                                expr = chip->computes[i].to_proc;
+
+                chip = NULL;
+                while ((chip = sensors_for_all_config_chips(name, chip)))
+                        for (i = 0; i < chip->computes_count; i++) {
+                                if (!strcmp(feature->name,
+                                            chip->computes[i].name)) {
+                                        expr = chip->computes[i].to_proc;
+                                        break;
+                                }
                         }
-                }
+        }
 
         to_write = value;