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

Timestamp:

09/23/07 13:59:51 (6 years ago)

Author:

khali

Message:

sensors_feature_data and sensors_chip_feature are now the exact
same structure, so we can get rid of the former for simpler code.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/lib/access.c (modified) (19 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_chip_feature *sensors_lookup_feature_nr(const sensors_chip_name *chip,
+const sensors_feature_data *sensors_lookup_feature_nr(const sensors_chip_name *chip,
                                                       int feature)
 {
@@ -108 +108 @@
    Do not modify the struct the return value points to! Returns NULL if 
    not found.*/
-static const sensors_chip_feature *
+static const sensors_feature_data *
 sensors_lookup_feature_name(const sensors_chip_name *chip, const char *feature)
 {
         int i, j;
-        const sensors_chip_feature *features;
+        const sensors_feature_data *features;
 
         for (i = 0; i < sensors_proc_chips_count; i++)
@@ -118 +118 @@
                         features = sensors_proc_chips[i].feature;
                         for (j = 0; j < sensors_proc_chips[i].feature_count; j++)
-                                if (!strcmp(features[j].data.name, feature))
+                                if (!strcmp(features[j].name, feature))
                                         return features + j;
                 }
@@ -146 +146 @@
         char *label;
         const sensors_chip *chip;
-        const sensors_chip_feature *featureptr;
+        const sensors_feature_data *featureptr;
         char buf[128], path[PATH_MAX];
         FILE *f;
@@ -158 +158 @@
         for (chip = NULL; (chip = sensors_for_all_config_chips(name, chip));)
                 for (i = 0; i < chip->labels_count; i++)
-                        if (!strcmp(featureptr->data.name, chip->labels[i].name)) {
+                        if (!strcmp(featureptr->name, chip->labels[i].name)) {
                                 label = strdup(chip->labels[i].value);
                                 goto sensors_get_label_exit;
@@ -165 +165 @@
         /* No user specified label, check for a _label sysfs file */
         snprintf(path, PATH_MAX, "%s/%s_label", name->path,
-                featureptr->data.name);
+                featureptr->name);
         
         if ((f = fopen(path, "r"))) {
@@ -179 +179 @@
 
         /* No label, return the feature name instead */
-        label = strdup(featureptr->data.name);
+        label = strdup(featureptr->name);
         
 sensors_get_label_exit:
@@ -192 +192 @@
    mappings into account. */
 static int sensors_get_ignored(const sensors_chip_name *name,
-                               const sensors_chip_feature *feature)
+                               const sensors_feature_data *feature)
 {
         const sensors_chip *chip;
@@ -198 +198 @@
         int i;
 
-        if (feature->data.mapping == SENSORS_NO_MAPPING)
+        if (feature->mapping == SENSORS_NO_MAPPING)
                 main_feature_name = NULL;
         else
                 main_feature_name = sensors_lookup_feature_nr(name,
-                                        feature->data.mapping)->data.name;
+                                        feature->mapping)->name;
 
         for (chip = NULL; (chip = sensors_for_all_config_chips(name, chip));)
                 for (i = 0; i < chip->ignores_count; i++)
-                        if (!strcmp(feature->data.name, chip->ignores[i].name) ||
+                        if (!strcmp(feature->name, chip->ignores[i].name) ||
                             (main_feature_name &&
                              !strcmp(main_feature_name, chip->ignores[i].name)))
@@ -219 +219 @@
                       double *result)
 {
-        const sensors_chip_feature *main_feature;
-        const sensors_chip_feature *alt_feature;
+        const sensors_feature_data *main_feature;
+        const sensors_feature_data *alt_feature;
         const sensors_chip *chip;
         const sensors_expr *expr = NULL;
@@ -232 +232 @@
                 return -SENSORS_ERR_NO_ENTRY;
 
-        if (main_feature->data.flags & SENSORS_COMPUTE_MAPPING)
+        if (main_feature->flags & SENSORS_COMPUTE_MAPPING)
                 alt_feature = sensors_lookup_feature_nr(name,
-                                        main_feature->data.mapping);
+                                        main_feature->mapping);
         else
                 alt_feature = NULL;
 
-        if (!(main_feature->data.flags & SENSORS_MODE_R))
+        if (!(main_feature->flags & SENSORS_MODE_R))
                 return -SENSORS_ERR_ACCESS_R;
         for (chip = NULL;
              !expr && (chip = sensors_for_all_config_chips(name, chip));)
                 for (i = 0; !final_expr && (i < chip->computes_count); i++) {
-                        if (!strcmp(main_feature->data.name, chip->computes[i].name)) {
+                        if (!strcmp(main_feature->name, chip->computes[i].name)) {
                                 expr = chip->computes[i].from_proc;
                                 final_expr = 1;
-                        } else if (alt_feature && !strcmp(alt_feature->data.name,
+                        } else if (alt_feature && !strcmp(alt_feature->name,
                                                chip->computes[i].name)) {
                                 expr = chip->computes[i].from_proc;
@@ -266 +266 @@
                       double value)
 {
-        const sensors_chip_feature *main_feature;
-        const sensors_chip_feature *alt_feature;
+        const sensors_feature_data *main_feature;
+        const sensors_feature_data *alt_feature;
         const sensors_chip *chip;
         const sensors_expr *expr = NULL;
@@ -279 +279 @@
                 return -SENSORS_ERR_NO_ENTRY;
 
-        if (main_feature->data.flags & SENSORS_COMPUTE_MAPPING)
+        if (main_feature->flags & SENSORS_COMPUTE_MAPPING)
                 alt_feature = sensors_lookup_feature_nr(name,
-                                        main_feature->data.mapping);
+                                        main_feature->mapping);
         else
                 alt_feature = NULL;
 
-        if (!(main_feature->data.flags & SENSORS_MODE_W))
+        if (!(main_feature->flags & SENSORS_MODE_W))
                 return -SENSORS_ERR_ACCESS_W;
         for (chip = NULL;
              !expr && (chip = sensors_for_all_config_chips(name, chip));)
                 for (i = 0; !final_expr && (i < chip->computes_count); i++)
-                        if (!strcmp(main_feature->data.name, chip->computes[i].name)) {
+                        if (!strcmp(main_feature->name, chip->computes[i].name)) {
                                 expr = chip->computes->to_proc;
                                 final_expr = 1;
-                        } else if (alt_feature && !strcmp(alt_feature->data.name,
+                        } else if (alt_feature && !strcmp(alt_feature->name,
                                                chip->computes[i].name)) {
                                 expr = chip->computes[i].to_proc;
@@ -348 +348 @@
                                                      int *nr)
 {
-        sensors_chip_feature *feature_list;
+        sensors_feature_data *feature_list;
         int i;
 
@@ -359 +359 @@
                         if (*nr == sensors_proc_chips[i].feature_count)
                                 return NULL;
-                        return &feature_list[(*nr)++].data;
+                        return &feature_list[(*nr)++];
                 }
         return NULL;
@@ -371 +371 @@
         double res1, res2;
         int res;
-        const sensors_chip_feature *feature;
+        const sensors_feature_data *feature;
 
         if (expr->kind == sensors_kind_val) {
@@ -385 +385 @@
                                                             expr->data.var)))
                         return SENSORS_ERR_NO_ENTRY;
-                if (!(res = sensors_get_value(name, feature->data.number, result)))
+                if (!(res = sensors_get_value(name, feature->number, result)))
                         return res;
                 return 0;
@@ -433 +433 @@
         int i, j;
         int err = 0, res;
-        const sensors_chip_feature *feature;
+        const sensors_feature_data *feature;
         int *feature_list = NULL;
         int feature_count = 0;
@@ -449 +449 @@
                                 continue;
                         }
-                        feature_nr = feature->data.number;
+                        feature_nr = feature->number;
 
                         /* Check whether we already set this feature */