Changeset 4832 for lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

Timestamp:

09/23/07 14:02:22 (6 years ago)

Author:

khali

Message:

Rename struct sensors_feature_data to sensors_subfeature. This is a
first step towards a clean separation between main features and
subfeatures.

Files:

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

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

@@ -90 +90 @@
    Do not modify the struct the return value points to! Returns NULL if 
    not found.*/
-const sensors_feature_data *sensors_lookup_feature_nr(const sensors_chip_name *chip,
+const sensors_subfeature *sensors_lookup_feature_nr(const sensors_chip_name *chip,
                                                       int feature)
 {
@@ -98 +98 @@
                 if (sensors_match_chip(&sensors_proc_chips[i].chip, chip)) {
                         if (feature < 0 ||
-                            feature >= sensors_proc_chips[i].feature_count)
+                            feature >= sensors_proc_chips[i].subfeature_count)
                                 return NULL;
-                        return sensors_proc_chips[i].feature + feature;
+                        return sensors_proc_chips[i].subfeature + feature;
                 }
         return NULL;
@@ -108 +108 @@
    Do not modify the struct the return value points to! Returns NULL if 
    not found.*/
-static const sensors_feature_data *
+static const sensors_subfeature *
 sensors_lookup_feature_name(const sensors_chip_name *chip, const char *feature)
 {
         int i, j;
-        const sensors_feature_data *features;
+        const sensors_subfeature *subfeatures;
 
         for (i = 0; i < sensors_proc_chips_count; i++)
                 if (sensors_match_chip(&sensors_proc_chips[i].chip, chip)) {
-                        features = sensors_proc_chips[i].feature;
-                        for (j = 0; j < sensors_proc_chips[i].feature_count; j++)
-                                if (!strcmp(features[j].name, feature))
-                                        return features + j;
+                        subfeatures = sensors_proc_chips[i].subfeature;
+                        for (j = 0; j < sensors_proc_chips[i].subfeature_count; j++)
+                                if (!strcmp(subfeatures[j].name, feature))
+                                        return subfeatures + j;
                 }
         return NULL;
@@ -146 +146 @@
         char *label;
         const sensors_chip *chip;
-        const sensors_feature_data *featureptr;
+        const sensors_subfeature *featureptr;
         char buf[128], path[PATH_MAX];
         FILE *f;
@@ -192 +192 @@
    mappings into account. */
 static int sensors_get_ignored(const sensors_chip_name *name,
-                               const sensors_feature_data *feature)
+                               const sensors_subfeature *feature)
 {
         const sensors_chip *chip;
@@ -219 +219 @@
                       double *result)
 {
-        const sensors_feature_data *main_feature;
-        const sensors_feature_data *alt_feature;
+        const sensors_subfeature *main_feature;
+        const sensors_subfeature *alt_feature;
         const sensors_chip *chip;
         const sensors_expr *expr = NULL;
@@ -266 +266 @@
                       double value)
 {
-        const sensors_feature_data *main_feature;
-        const sensors_feature_data *alt_feature;
+        const sensors_subfeature *main_feature;
+        const sensors_subfeature *alt_feature;
         const sensors_chip *chip;
         const sensors_expr *expr = NULL;
@@ -344 +344 @@
 }
 
-static const sensors_feature_data *
+static const sensors_subfeature *
 sensors_get_all_features(const sensors_chip_name *name, int *nr)
 {
-        sensors_feature_data *feature_list;
+        sensors_subfeature *subfeature_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]))
+                        subfeature_list = sensors_proc_chips[i].subfeature;
+                        while (*nr < sensors_proc_chips[i].subfeature_count
+                            && sensors_get_ignored(name, &subfeature_list[*nr]))
                                 (*nr)++;
-                        if (*nr == sensors_proc_chips[i].feature_count)
+                        if (*nr == sensors_proc_chips[i].subfeature_count)
                                 return NULL;
-                        return &feature_list[(*nr)++];
+                        return &subfeature_list[(*nr)++];
                 }
         return NULL;
 }
 
-const sensors_feature_data *
+const sensors_subfeature *
 sensors_get_features(const sensors_chip_name *name, int *nr)
 {
-        const sensors_feature_data *feature;
+        const sensors_subfeature *feature;
 
         while ((feature = sensors_get_all_features(name, nr))) {
@@ -375 +375 @@
 }
 
-const sensors_feature_data *
+const sensors_subfeature *
 sensors_get_all_subfeatures(const sensors_chip_name *name, int feature, int *nr)
 {
-        const sensors_feature_data *subfeature;
+        const sensors_subfeature *subfeature;
 
         /* Seek directly to the first subfeature */
@@ -400 +400 @@
         double res1, res2;
         int res;
-        const sensors_feature_data *feature;
+        const sensors_subfeature *feature;
 
         if (expr->kind == sensors_kind_val) {
@@ -462 +462 @@
         int i, j;
         int err = 0, res;
-        const sensors_feature_data *feature;
+        const sensors_subfeature *feature;
         int *feature_list = NULL;
         int feature_count = 0;