Changeset 4694

Timestamp:

08/22/07 19:05:01 (6 years ago)

Author:

khali

Message:

Change the prototype of sensors_get_label(). Errors can be reported
with a NULL pointer.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

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

@@ -140 +140 @@
 
 /* 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.
+   contain wildcard values! The returned string is newly allocated (free it
+   yourself). On failure, NULL is returned.
    If no label exists for this feature, its name is returned itself. */
-int sensors_get_label(const sensors_chip_name *name, int feature, char **result)
-{
+char *sensors_get_label(const sensors_chip_name *name, int feature)
+{
+        char *label;
         const sensors_chip *chip;
         const sensors_chip_feature *featureptr;
@@ -151 +152 @@
         int i;
 
-        *result = NULL;
         if (sensors_chip_name_has_wildcards(name))
-                return -SENSORS_ERR_WILDCARDS;
+                return NULL;
         if (!(featureptr = sensors_lookup_feature_nr(name, feature)))
-                return -SENSORS_ERR_NO_ENTRY;
+                return NULL;
 
         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)){
-                                *result = strdup(chip->labels[i].value);
+                                label = strdup(chip->labels[i].value);
                                 goto sensors_get_label_exit;
                         }
@@ -174 +174 @@
                         /* i - 1 to strip the '\n' at the end */
                         buf[i - 1] = 0;
-                        *result = strdup(buf);
+                        label = strdup(buf);
                         goto sensors_get_label_exit;
                 }
@@ -180 +180 @@
 
         /* No label, return the feature name instead */
-        *result = strdup(featureptr->data.name);
+        label = strdup(featureptr->data.name);
         
 sensors_get_label_exit:
-        if (*result == NULL)
+        if (!label)
                 sensors_fatal_error("sensors_get_label",
                                     "Allocating label text");
-        return 0;
+        return label;
 }
 

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

@@ -39 +39 @@
                        \fBconst sensors_chip_name *chip2);\fP
 .B const char *sensors_get_adapter_name(int bus_nr);
-.B int sensors_get_label(const sensors_chip_name *name, int feature,
-                      \fBchar **result);\fP
+.B char *sensors_get_label(const sensors_chip_name *name, int feature);\fP
 .B int sensors_get_feature(const sensors_chip_name *name, int feature,
                         \fBdouble *result);\fP
@@ -79 +78 @@
 sensors_chip_name structure. If it could not be found, it returns NULL.
 
-\fBint sensors_get_label(const sensors_chip_name *name, int feature,
-                      char **result);\fP
+\fBchar *sensors_get_label(const sensors_chip_name *name, int feature);\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.
+Look up the label which belongs to this chip. Note that chip should not
+contain wildcard values! The returned string is newly allocated (free it
+yourself). On failure, NULL is returned.
+If no label exists for this feature, its name is returned itself.
 
 \fBint sensors_get_feature(const sensors_chip_name *name,

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

@@ -89 +89 @@
 
 /* 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.
+   contain wildcard values! The returned string is newly allocated (free it
+   yourself). On failure, NULL is returned.
    If no label exists for this feature, its name is returned itself. */
-int sensors_get_label(const sensors_chip_name *name, int feature,
-                      char **result);
+char *sensors_get_label(const sensors_chip_name *name, int feature);
 
 /* Read the value of a feature of a certain chip. Note that chip should not

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

@@ -164 +164 @@
               sensorLog (LOG_ERR, "Error getting raw sensor label: %s/#%d", chip->prefix, labelNumber);
               ret = -1;
-            } else if (getLabel (chip, labelNumber, &label)) {
+            } else if (!(label = sensors_get_label (chip, labelNumber))) {
               sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
               ret = -1;

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

@@ -43 +43 @@
     err = 0;
   }
-  return err;
-}
-
-int
-getLabel
-(const sensors_chip_name *name, int feature, char **label) {
-  int err;
-  err = sensors_get_label (name, feature, label);
   return err;
 }
@@ -110 +102 @@
       sensorLog (LOG_ERR, "Error getting sensor validity: %s/%s", chip->prefix, sensor->name);
       ret = 20;
-    } else if (getLabel (chip, sensor->number, &label)) {
+    } else if (!(label = sensors_get_label (chip, sensor->number))) {
       sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, sensor->name);
       ret = 21;
@@ -170 +162 @@
       sensorLog (LOG_ERR, "Error getting sensor validity: %s/#%d", chip->prefix, labelNumber);
       ret = 22;
-    } else if (getLabel (chip, labelNumber, &label)) {
+    } else if (!(label = sensors_get_label (chip, labelNumber))) {
       sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
       ret = 22;

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.h

@@ -60 +60 @@
 
 extern int getValid (const sensors_chip_name *name, int feature, int *valid);
-extern int getLabel (const sensors_chip_name *name, int feature, char **label);
 extern int getRawLabel (const sensors_chip_name *name, int feature, const char **label);
 

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

@@ -92 +92 @@
   double vid;
 
-  if (!sensors_get_label(name, f_vid, &label)
+  if ((label = sensors_get_label(name, f_vid))
       && !sensors_get_feature(name, f_vid, &vid)) {
     print_label(label, label_size);
@@ -109 +109 @@
   a = 0;
   while((data=sensors_get_all_features(name, &a))) {
-    if (sensors_get_label(name, data->number, &label)) {
+    if (!(label = sensors_get_label(name, data->number))) {
       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

@@ -70 +70 @@
   i = 0;
   while((iter = sensors_get_all_features(name, &i))) {
-    if (!sensors_get_label(name, iter->number, &label) &&
+    if ((label = sensors_get_label(name, iter->number)) &&
         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 (!(label = sensors_get_label(name, feature->number))) {
     printf("ERROR: Can't get temperature label!\n");
     return;
@@ -212 +212 @@
   char *label;
   
-  if (sensors_get_label(name, feature->number, &label)) {
+  if (!(label = sensors_get_label(name, feature->number))) {
     printf("ERROR: Can't get in label!\n");
     return;
@@ -274 +274 @@
   double val;
   
-  if (sensors_get_label(name, feature->number, &label)) {
+  if (!(label = sensors_get_label(name, feature->number))) {
     printf("ERROR: Can't get fan label!\n");
     return;