Changeset 4666

Timestamp:

08/13/07 22:16:03 (6 years ago)

Author:

khali

Message:

Change the libsensors API so that all structures are passed by
reference. This is more efficient that way.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• lib/access.c (modified) (21 diffs)
• lib/libsensors.3 (modified) (4 diffs)
• lib/sensors.h (modified) (5 diffs)
• prog/sensord/rrd.c (modified) (1 diff)
• prog/sensord/sense.c (modified) (9 diffs)
• prog/sensors/chips.c (modified) (2 diffs)
• prog/sensors/chips_generic.c (modified) (7 diffs)
• prog/sensors/main.c (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -20 +20 @@
            No longer export sensors_chip_name_has_wildcards()
            Delete sensors_do_all_sets(), unused
+           Pass structures by reference
   Makefile: Drop the package and version targets
   Man page sensors.conf.5: Update the chip statement section

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

@@ -34 +34 @@
 /* Compare two chips name descriptions, to see whether they could match.
    Return 0 if it does not match, return 1 if it does match. */
-int sensors_match_chip(sensors_chip_name chip1, sensors_chip_name chip2)
-{
-        if ((chip1.prefix != SENSORS_CHIP_NAME_PREFIX_ANY) &&
-            (chip2.prefix != SENSORS_CHIP_NAME_PREFIX_ANY) &&
-            strcasecmp(chip1.prefix, chip2.prefix))
-                return 0;
-
-        if ((chip1.bus != SENSORS_CHIP_NAME_BUS_ANY) &&
-            (chip2.bus != SENSORS_CHIP_NAME_BUS_ANY) &&
-            (chip1.bus != chip2.bus)) {
-
-                if ((chip1.bus == SENSORS_CHIP_NAME_BUS_ISA) ||
-                    (chip2.bus == SENSORS_CHIP_NAME_BUS_ISA))
+int sensors_match_chip(const sensors_chip_name *chip1,
+                       const sensors_chip_name *chip2)
+{
+        if ((chip1->prefix != SENSORS_CHIP_NAME_PREFIX_ANY) &&
+            (chip2->prefix != SENSORS_CHIP_NAME_PREFIX_ANY) &&
+            strcasecmp(chip1->prefix, chip2->prefix))
+                return 0;
+
+        if ((chip1->bus != SENSORS_CHIP_NAME_BUS_ANY) &&
+            (chip2->bus != SENSORS_CHIP_NAME_BUS_ANY) &&
+            (chip1->bus != chip2->bus)) {
+
+                if ((chip1->bus == SENSORS_CHIP_NAME_BUS_ISA) ||
+                    (chip2->bus == SENSORS_CHIP_NAME_BUS_ISA))
                         return 0;
 
-                if ((chip1.bus == SENSORS_CHIP_NAME_BUS_PCI) ||
-                    (chip2.bus == SENSORS_CHIP_NAME_BUS_PCI))
+                if ((chip1->bus == SENSORS_CHIP_NAME_BUS_PCI) ||
+                    (chip2->bus == SENSORS_CHIP_NAME_BUS_PCI))
                         return 0;
 
-                if ((chip1.bus != SENSORS_CHIP_NAME_BUS_ANY_I2C) &&
-                    (chip2.bus != SENSORS_CHIP_NAME_BUS_ANY_I2C))
+                if ((chip1->bus != SENSORS_CHIP_NAME_BUS_ANY_I2C) &&
+                    (chip2->bus != SENSORS_CHIP_NAME_BUS_ANY_I2C))
                         return 0;
         }
 
-        if ((chip1.addr != chip2.addr) &&
-            (chip1.addr != SENSORS_CHIP_NAME_ADDR_ANY) &&
-            (chip2.addr != SENSORS_CHIP_NAME_ADDR_ANY))
+        if ((chip1->addr != chip2->addr) &&
+            (chip1->addr != SENSORS_CHIP_NAME_ADDR_ANY) &&
+            (chip2->addr != SENSORS_CHIP_NAME_ADDR_ANY))
                 return 0;
 
@@ -85 +86 @@
                 chips = sensors_config_chips[nr].chips;
                 for (i = 0; i < chips.fits_count; i++) {
-                        if (sensors_match_chip(chips.fits[i], chip_name))
+                        if (sensors_match_chip(&chips.fits[i], &chip_name))
                                 return sensors_config_chips + nr;
                 }
@@ -102 +103 @@
 
         for (i = 0; i < sensors_proc_chips_count; i++)
-                if (sensors_match_chip(sensors_proc_chips[i].chip, *chip)) {
+                if (sensors_match_chip(&sensors_proc_chips[i].chip, chip)) {
                         features = sensors_proc_chips[i].feature;
                         for (j = 0; features[j].data.name; j++)
@@ -121 +122 @@
 
         for (i = 0; i < sensors_proc_chips_count; i++)
-                if (sensors_match_chip(sensors_proc_chips[i].chip, *chip)) {
+                if (sensors_match_chip(&sensors_proc_chips[i].chip, chip)) {
                         features = sensors_proc_chips[i].feature;
                         for (j = 0; features[j].data.name; j++)
@@ -148 +149 @@
    This function will return 0 on success, and <0 on failure.
    If no label exists for this feature, its name is returned itself. */
-int sensors_get_label(sensors_chip_name name, int feature, char **result)
+int sensors_get_label(const sensors_chip_name *name, int feature, char **result)
 {
         const sensors_chip *chip;
@@ -157 +158 @@
 
         *result = NULL;
-        if (sensors_chip_name_has_wildcards(name))
+        if (sensors_chip_name_has_wildcards(*name))
                 return -SENSORS_ERR_WILDCARDS;
-        if (!(featureptr = sensors_lookup_feature_nr(&name, feature)))
+        if (!(featureptr = sensors_lookup_feature_nr(name, feature)))
                 return -SENSORS_ERR_NO_ENTRY;
 
-        for (chip = NULL; (chip = sensors_for_all_config_chips(name, chip));)
+        for (chip = NULL; (chip = sensors_for_all_config_chips(*name, chip));)
                 for (i = 0; i < chip->labels_count; i++)
                         if (!strcasecmp(featureptr->data.name,chip->labels[i].name)){
@@ -170 +171 @@
 
         /* No user specified label, check for a _label sysfs file */
-        snprintf(path, PATH_MAX, "%s/%s_label", name.busname,
+        snprintf(path, PATH_MAX, "%s/%s_label", name->busname,
                 featureptr->data.name);
         
@@ -222 +223 @@
    contain wildcard values! This function will return 0 on success, and <0
    on failure. */
-int sensors_get_feature(sensors_chip_name name, int feature, double *result)
+int sensors_get_feature(const sensors_chip_name *name, int feature,
+                        double *result)
 {
         const sensors_chip_feature *main_feature;
@@ -232 +234 @@
         int final_expr = 0;
 
-        if (sensors_chip_name_has_wildcards(name))
+        if (sensors_chip_name_has_wildcards(*name))
                 return -SENSORS_ERR_WILDCARDS;
-        if (!(main_feature = sensors_lookup_feature_nr(&name, feature)))
+        if (!(main_feature = sensors_lookup_feature_nr(name, feature)))
                 return -SENSORS_ERR_NO_ENTRY;
         if (main_feature->data.compute_mapping == SENSORS_NO_MAPPING)
                 alt_feature = NULL;
-        else if (!(alt_feature = sensors_lookup_feature_nr(&name,
+        else if (!(alt_feature = sensors_lookup_feature_nr(name,
                                         main_feature->data.compute_mapping)))
                 return -SENSORS_ERR_NO_ENTRY;
@@ -244 +246 @@
                 return -SENSORS_ERR_ACCESS_R;
         for (chip = NULL;
-             !expr && (chip = sensors_for_all_config_chips(name, chip));)
+             !expr && (chip = sensors_for_all_config_chips(*name, chip));)
                 for (i = 0; !final_expr && (i < chip->computes_count); i++) {
                         if (!strcasecmp(main_feature->data.name, chip->computes[i].name)) {
@@ -254 +256 @@
                         }
                 }
-        if (sensors_read_sysfs_attr(name, feature, &val))
+        if (sensors_read_sysfs_attr(*name, feature, &val))
                 return -SENSORS_ERR_PROC;
         if (!expr)
                 *result = val;
-        else if ((res = sensors_eval_expr(name, expr, val, result)))
+        else if ((res = sensors_eval_expr(*name, expr, val, result)))
                 return res;
         return 0;
@@ -266 +268 @@
    contain wildcard values! This function will return 0 on success, and <0
    on failure. */
-int sensors_set_feature(sensors_chip_name name, int feature, double value)
+int sensors_set_feature(const sensors_chip_name *name, int feature,
+                        double value)
 {
         const sensors_chip_feature *main_feature;
@@ -276 +279 @@
         double to_write;
 
-        if (sensors_chip_name_has_wildcards(name))
+        if (sensors_chip_name_has_wildcards(*name))
                 return -SENSORS_ERR_WILDCARDS;
-        if (!(main_feature = sensors_lookup_feature_nr(&name, feature)))
+        if (!(main_feature = sensors_lookup_feature_nr(name, feature)))
                 return -SENSORS_ERR_NO_ENTRY;
         if (main_feature->data.compute_mapping == SENSORS_NO_MAPPING)
                 alt_feature = NULL;
-        else if (!(alt_feature = sensors_lookup_feature_nr(&name,
+        else if (!(alt_feature = sensors_lookup_feature_nr(name,
                                              main_feature->data.compute_mapping)))
                 return -SENSORS_ERR_NO_ENTRY;
@@ -288 +291 @@
                 return -SENSORS_ERR_ACCESS_W;
         for (chip = NULL;
-             !expr && (chip = sensors_for_all_config_chips(name, chip));)
+             !expr && (chip = sensors_for_all_config_chips(*name, chip));)
                 for (i = 0; !final_expr && (i < chip->computes_count); i++)
                         if (!strcasecmp(main_feature->data.name, chip->computes[i].name)) {
@@ -300 +303 @@
         to_write = value;
         if (expr)
-                if ((res = sensors_eval_expr(name, expr, value, &to_write)))
+                if ((res = sensors_eval_expr(*name, expr, value, &to_write)))
                         return res;
-        if (sensors_write_sysfs_attr(name, feature, to_write))
+        if (sensors_write_sysfs_attr(*name, feature, to_write))
                 return -SENSORS_ERR_PROC;
         return 0;
@@ -333 +336 @@
 
 /* nr-1 is the last feature returned */
-const sensors_feature_data *sensors_get_all_features(sensors_chip_name name,
+const sensors_feature_data *sensors_get_all_features(const sensors_chip_name *name,
                                                      int *nr)
 {
@@ -340 +343 @@
 
         for (i = 0; i < sensors_proc_chips_count; i++)
-                if (sensors_match_chip(sensors_proc_chips[i].chip, name)) {
+                if (sensors_match_chip(&sensors_proc_chips[i].chip, name)) {
                         feature_list = sensors_proc_chips[i].feature;
                         while (feature_list[*nr].data.name
-                            && sensors_get_ignored(&name, &feature_list[*nr]))
+                            && sensors_get_ignored(name, &feature_list[*nr]))
                                 (*nr)++;
                         if (!feature_list[*nr].data.name)
@@ -372 +375 @@
                                                             expr->data.var)))
                         return SENSORS_ERR_NO_ENTRY;
-                if (!(res = sensors_get_feature(chipname, feature->data.number, result)))
+                if (!(res = sensors_get_feature(&chipname, feature->data.number, result)))
                         return res;
                 return 0;
@@ -456 +459 @@
                                 continue;
                         }
-                        if ((res = sensors_set_feature(name, feature_nr, value))) {
+                        if ((res = sensors_set_feature(&name, feature_nr, value))) {
                                 sensors_parse_error("Failed to set feature",
                                                 chip->sets[i].lineno);
@@ -469 +472 @@
 /* Execute all set statements for this particular chip. The chip may contain
    wildcards!  This function will return 0 on success, and <0 on failure. */
-int sensors_do_chip_sets(sensors_chip_name name)
+int sensors_do_chip_sets(const sensors_chip_name *name)
 {
         int nr, this_res;
@@ -476 +479 @@
 
         for (nr = 0; (found_name = sensors_get_detected_chips(&nr));)
-                if (sensors_match_chip(name, *found_name)) {
+                if (sensors_match_chip(name, found_name)) {
                         this_res = sensors_do_this_chip_sets(*found_name);
                         if (!res)

lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3

@@ -36 +36 @@
 .B int sensors_parse_chip_name(const char *orig_name,
                             \fBsensors_chip_name *res);\fP
-.B int sensors_match_chip(sensors_chip_name chip1, 
-                       \fBsensors_chip_name chip2);\fP
+.B int sensors_match_chip(const sensors_chip_name *chip1,
+                       \fBconst sensors_chip_name *chip2);\fP
 .B const char *sensors_get_adapter_name(int bus_nr);
-.B int sensors_get_label(sensors_chip_name name, int feature, 
+.B int sensors_get_label(const sensors_chip_name *name, int feature,
                       \fBchar **result);\fP
-.B int sensors_get_feature(sensors_chip_name name, int feature,
+.B int sensors_get_feature(const sensors_chip_name *name, int feature,
                         \fBdouble *result);\fP
-.B int sensors_set_feature(sensors_chip_name name, int feature,
+.B int sensors_set_feature(const sensors_chip_name *name, int feature,
                         \fBdouble value);\fP
-.B int sensors_do_chip_sets(sensors_chip_name name);
+.B int sensors_do_chip_sets(const sensors_chip_name *name);
 .B const sensors_chip_name *sensors_get_detected_chips(int *nr);
 .B const sensors_feature_data *sensors_get_all_features 
-             \fB(sensors_chip_name name, int *nr);\fP
+             \fB(const sensors_chip_name *name, int *nr);\fP
 .B const char *libsensors_version;
 .fi
@@ -66 +66 @@
 Parse a chip name to the internal representation. Return 0 on succes, <0 on error.
 
-\fBint sensors_match_chip(sensors_chip_name chip1,
-                       sensors_chip_name chip2);\fP
+\fBint sensors_match_chip(const sensors_chip_name *chip1,
+                       const sensors_chip_name *chip2);\fP
 .br
 Compare two chips name descriptions, to see whether they could match. Return 0 if it does not match, return 1 if it does match.
@@ -76 +76 @@
 sensors_chip_name structure. If it could not be found, it returns NULL.
 
-\fBint sensors_get_label(sensors_chip_name name, int feature,
+\fBint sensors_get_label(const sensors_chip_name *name, int feature,
                       char **result);\fP
 .br
 Look up the label which belongs to this chip. Note that chip should not contain wildcard values! *result is newly allocated (free it yourself). This function will return 0 on success, and <0 on failure.
 
-\fBint sensors_get_feature(sensors_chip_name name,
+\fBint sensors_get_feature(const sensors_chip_name *name,
                         int feature, double *result);\fP
 .br
 Read the value of a feature of a certain chip. Note that chip should not contain wildcard values! This function will return 0 on success, and <0 on failure.
 
-\fBint sensors_set_feature(sensors_chip_name name,
+\fBint sensors_set_feature(const sensors_chip_name *name,
                         int feature, double value);\fP
 .br
 Set the value of a feature of a certain chip. Note that chip should not contain wildcard values! This function will return 0 on success, and <0 on failure.
 
-.B int sensors_do_chip_sets(sensors_chip_name name);
+.B int sensors_do_chip_sets(const sensors_chip_name *name);
 .br
 Execute all set statements for this particular chip. The chip may contain wildcards!  This function will return 0 on success, and <0 on failure.
@@ -123 +123 @@
 
 \fBconst sensors_feature_data *sensors_get_all_features
-      (sensors_chip_name name, int *nr);\fP
+      (const sensors_chip_name *name, int *nr);\fP
 .br
 This returns all features of a specific chip. They are returned in bunches:

lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h

@@ -64 +64 @@
 /* Compare two chips name descriptions, to see whether they could match.
    Return 0 if it does not match, return 1 if it does match. */
-extern int sensors_match_chip(sensors_chip_name chip1, 
-                              sensors_chip_name chip2);
+extern int sensors_match_chip(const sensors_chip_name *chip1,
+                              const sensors_chip_name *chip2);
 
 /* This function returns the adapter name of a bus number,
@@ -76 +76 @@
    This function will return 0 on success, and <0 on failure.  This
    function takes logical mappings into account. */
-extern int sensors_get_label(sensors_chip_name name, int feature, 
+extern int sensors_get_label(const sensors_chip_name *name, int feature,
                              char **result);
 
@@ -82 +82 @@
    contain wildcard values! This function will return 0 on success, and <0
    on failure.  */
-extern int sensors_get_feature(sensors_chip_name name, int feature,
+extern int sensors_get_feature(const sensors_chip_name *name, int feature,
                                double *result);
 
@@ -88 +88 @@
    contain wildcard values! This function will return 0 on success, and <0
    on failure. */
-extern int sensors_set_feature(sensors_chip_name name, int feature,
+extern int sensors_set_feature(const sensors_chip_name *name, int feature,
                                double value);
 
 /* Execute all set statements for this particular chip. The chip may contain
    wildcards!  This function will return 0 on success, and <0 on failure. */
-extern int sensors_do_chip_sets(sensors_chip_name name);
+extern int sensors_do_chip_sets(const sensors_chip_name *name);
 
 /* This function returns all detected chips, one by one. To start at the
@@ -172 +172 @@
    data structures. */
 extern const sensors_feature_data *sensors_get_all_features
-             (sensors_chip_name name, int *nr);
+             (const sensors_chip_name *name, int *nr);
 
 #ifdef __cplusplus

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

@@ -142 +142 @@
   while ((ret == 0) && ((chip = sensors_get_detected_chips (&i)) != NULL)) {
     for (j = 0; (ret == 0) && (j < numChipNames); ++ j) {
-      if (sensors_match_chip (*chip, chipNames[j])) {
+      if (sensors_match_chip (chip, &chipNames[j])) {
         int index0, subindex, chipindex = -1;
         for (index0 = 0; knownChips[index0]; ++ index0)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c

@@ -50 +50 @@
 (sensors_chip_name name, int feature, char **label) {
   int err;
-  err = sensors_get_label (name, feature, label);
+  err = sensors_get_label (&name, feature, label);
   return err;
 }
@@ -60 +60 @@
   int nr1 = 0, nr2 = 0, err = 0;
   do {
-    rawFeature = sensors_get_all_features (name, &nr1, &nr2);
+    rawFeature = sensors_get_all_features (&name, &nr1, &nr2);
   } while (rawFeature && (rawFeature->number != feature));
   /* TODO: Ensure labels match RRD construct and are not repeated! */
@@ -106 +106 @@
   ret = idChip (chip);
 
-  while ((ret == 0) && ((sensor = sensors_get_all_features (*chip, &index0, &index1)) != NULL)) {
+  while ((ret == 0) && ((sensor = sensors_get_all_features (chip, &index0, &index1)) != NULL)) {
     char *label = NULL;
     int valid = 0;
@@ -121 +121 @@
     } else if (!(sensor->mode & SENSORS_MODE_R)) {
       sensorLog (LOG_INFO, "%s: %s", sensor->name, label);
-    } else if ((ret = sensors_get_feature (*chip, sensor->number, &value))) {
+    } else if ((ret = sensors_get_feature (chip, sensor->number, &value))) {
       sensorLog (LOG_ERR, "Error getting sensor data: %s/%s: %s", chip->prefix, sensor->name, sensors_strerror (ret));
       ret = 22;
@@ -146 +146 @@
     ret = idChip (chip);
   if (!ret && descriptor->alarmNumber) {
-    if ((ret = sensors_get_feature (*chip, descriptor->alarmNumber, &tmp))) {
+    if ((ret = sensors_get_feature (chip, descriptor->alarmNumber, &tmp))) {
       sensorLog (LOG_ERR, "Error getting sensor data: %s/#%d: %s", chip->prefix, descriptor->alarmNumber, sensors_strerror (ret));
       ret = 20;
@@ -154 +154 @@
   }
   if (!ret && descriptor->beepNumber) {
-    if ((ret = sensors_get_feature (*chip, descriptor->beepNumber, &tmp))) {
+    if ((ret = sensors_get_feature (chip, descriptor->beepNumber, &tmp))) {
       sensorLog (LOG_ERR, "Error getting sensor data: %s/#%d: %s", chip->prefix, descriptor->beepNumber, sensors_strerror (ret));
       ret = 21;
@@ -181 +181 @@
 
       for (subindex = 0; !ret && (feature->dataNumbers[subindex] >= 0); ++ subindex) {
-        if ((ret = sensors_get_feature (*chip, feature->dataNumbers[subindex], values + subindex))) {
+        if ((ret = sensors_get_feature (chip, feature->dataNumbers[subindex], values + subindex))) {
           sensorLog (LOG_ERR, "Error getting sensor data: %s/#%d: %s", chip->prefix, feature->dataNumbers[subindex], sensors_strerror (ret));
           ret = 23;
@@ -216 +216 @@
   if ((ret = idChip (chip))) {
     sensorLog (LOG_ERR, "Error identifying chip: %s", chip->prefix);
-  } else if ((ret = sensors_do_chip_sets (*chip))) {
+  } else if ((ret = sensors_do_chip_sets (chip))) {
     sensorLog (LOG_ERR, "Error performing chip sets: %s: %s", chip->prefix, sensors_strerror (ret));
     ret = 50;
@@ -253 +253 @@
   while ((ret == 0) && ((chip = sensors_get_detected_chips (&i)) != NULL)) {
     for (j = 0; (ret == 0) && (j < numChipNames); ++ j) {
-      if (sensors_match_chip (*chip, chipNames[j])) {
+      if (sensors_match_chip (chip, &chipNames[j])) {
         ret = doChip (chip, action);
       }

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

@@ -92 +92 @@
   double vid;
 
-  if (!sensors_get_label(*name, f_vid, &label)
-      && !sensors_get_feature(*name,f_vid,&vid) ) {
+  if (!sensors_get_label(name, f_vid, &label)
+      && !sensors_get_feature(name, f_vid, &vid)) {
     print_label(label, label_size);
     printf("%+6.3f V\n", vid);
@@ -108 +108 @@
  
   a = 0;
-  while((data=sensors_get_all_features(*name, &a))) {
-    if (sensors_get_label(*name, data->number, &label)) {
+  while((data=sensors_get_all_features(name, &a))) {
+    if (sensors_get_label(name, data->number, &label)) {
       printf("ERROR: Can't get feature `%s' data!\n",data->name);
       continue;
     }
     if (data->mode & SENSORS_MODE_R) {
-      if(sensors_get_feature(*name,data->number,&val)) {
+      if(sensors_get_feature(name, data->number, &val)) {
         printf("ERROR: Can't get feature `%s' data!\n",data->name);
         continue;

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips_generic.c

@@ -31 +31 @@
                              double *val)
 {
-  return sensors_get_feature(*name, feature->number, val);
+  return sensors_get_feature(name, feature->number, val);
 }
 
@@ -44 +44 @@
   const sensors_feature_data *iter;
   
-  while((iter = sensors_get_all_features(*name, &i)) &&
+  while((iter = sensors_get_all_features(name, &i)) &&
       iter->mapping == feature->number) {
     int indx;
@@ -69 +69 @@
 
   i = 0;
-  while((iter = sensors_get_all_features(*name, &i))) {
-    if (!sensors_get_label(*name, iter->number, &label) &&
+  while((iter = sensors_get_all_features(name, &i))) {
+    if (!sensors_get_label(name, iter->number, &label) &&
         strlen(label) > max_size)
       max_size = strlen(label);
@@ -99 +99 @@
   double feature_vals[SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP] = {0.0, };
   
-  if (sensors_get_label(*name, feature->number, &label)) {
+  if (sensors_get_label(name, feature->number, &label)) {
     free(label);
     printf("ERROR: Can't get temperature label!\n");
@@ -213 +213 @@
   char *label;
   
-  if (sensors_get_label(*name, feature->number, &label)) {
+  if (sensors_get_label(name, feature->number, &label)) {
     free(label);
     printf("ERROR: Can't get in label!\n");
@@ -276 +276 @@
   double val;
   
-  if (sensors_get_label(*name, feature->number, &label)) {
+  if (sensors_get_label(name, feature->number, &label)) {
     printf("ERROR: Can't get fan label!\n");
     free(label);
@@ -327 +327 @@
   
   i = 0;
-  while((feature = sensors_get_all_features(*name, &i))) {
+  while((feature = sensors_get_all_features(name, &i))) {
     if (feature->mapping != SENSORS_NO_MAPPING)
       continue;

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

@@ -260 +260 @@
   for (chip_nr = 0; (chip = sensors_get_detected_chips(&chip_nr));)
     for(i = 0; i < chips_count; i++)
-      if (sensors_match_chip(*chip,chips[i])) {
+      if (sensors_match_chip(chip, &chips[i])) {
         if(do_sets) {
           if (do_a_set(*chip))
@@ -277 +277 @@
   int res;
 
-  if ((res = sensors_do_chip_sets(name))) {
+  if ((res = sensors_do_chip_sets(&name))) {
     if (res == -SENSORS_ERR_PROC) {
       fprintf(stderr,"%s: %s for writing;\n",sprintf_chip_name(name),