Changeset 4845

Timestamp:

09/23/07 14:24:13 (6 years ago)

Author:

khali

Message:

Use sensors_lookup_chip() wherever possible, it makes the code
more readable.

Files:

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

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

@@ -359 +359 @@
 sensors_get_features(const sensors_chip_name *name, int *nr)
 {
-        const sensors_feature *feature_list;
-        int i;
-
-        for (i = 0; i < sensors_proc_chips_count; i++)
-                if (sensors_match_chip(&sensors_proc_chips[i].chip, name)) {
-                        feature_list = sensors_proc_chips[i].feature;
-                        while (*nr < sensors_proc_chips[i].feature_count
-                            && sensors_get_ignored(name, &feature_list[*nr]))
-                                (*nr)++;
-                        if (*nr >= sensors_proc_chips[i].feature_count)
-                                return NULL;
-                        return &feature_list[(*nr)++];
-                }
-        return NULL;    /* end of list */
+        const sensors_chip_features *chip;
+
+        if (!(chip = sensors_lookup_chip(name)))
+                return NULL;    /* No such chip */
+
+        while (*nr < chip->feature_count
+            && sensors_get_ignored(name, &chip->feature[*nr]))
+                (*nr)++;
+        if (*nr >= chip->feature_count)
+                return NULL;
+        return &chip->feature[(*nr)++];
 }
 
@@ -379 +376 @@
                         const sensors_feature *feature, int *nr)
 {
+        const sensors_chip_features *chip;
         const sensors_subfeature *subfeature;
-        int i;
+
+        if (!(chip = sensors_lookup_chip(name)))
+                return NULL;    /* No such chip */
 
         /* Seek directly to the first subfeature */
@@ -386 +386 @@
                 *nr = feature->first_subfeature;
 
-        for (i = 0; i < sensors_proc_chips_count; i++)
-                if (sensors_match_chip(&sensors_proc_chips[i].chip, name)) {
-                        if (*nr >= sensors_proc_chips[i].subfeature_count)
-                                return NULL;    /* end of list */
-                        subfeature = &sensors_proc_chips[i].subfeature[(*nr)++];
-                        if (subfeature->mapping == feature->number)
-                                return subfeature;
-                        return NULL;    /* end of subfeature list */
-                }
-        return NULL;            /* no matching chip */
+        if (*nr >= chip->subfeature_count)
+                return NULL;    /* end of list */
+        subfeature = &chip->subfeature[(*nr)++];
+        if (subfeature->mapping == feature->number)
+                return subfeature;
+        return NULL;    /* end of subfeature list */
 }