Changeset 4645

Timestamp:

07/24/07 10:21:23 (6 years ago)

Author:

khali

Message:

We no longer need sensors_get_label_and_valid(), as it does hardly
more than sensors_get_label(). This allows for some cleanups.

Location:

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors

Files:

• chips.c (modified) (3 diffs)
• chips.h (modified) (1 diff)
• chips_generic.c (modified) (7 diffs)

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

@@ -87 +87 @@
 }
 
-int sensors_get_label_and_valid(sensors_chip_name name, int feature, char **label,
-                        int *valid)
-{
-  int err;
-  err = sensors_get_label(name,feature,label);
-  *valid = !err;
-  return err;
-}
-
 void print_vid_info(const sensors_chip_name *name, int f_vid, int label_size)
 {
   char *label;
-  int valid;
   double vid;
 
-  if (!sensors_get_label_and_valid(*name,f_vid,&label,&valid)
+  if (!sensors_get_label(*name, f_vid, &label)
       && !sensors_get_feature(*name,f_vid,&vid) ) {
-    if (valid) {
-      print_label(label, label_size);
-      printf("%+6.3f V\n", vid);
-    }
+    print_label(label, label_size);
+    printf("%+6.3f V\n", vid);
   }
   free(label);
@@ -114 +102 @@
 void print_unknown_chip(const sensors_chip_name *name)
 {
-  int a, valid;
+  int a;
   const sensors_feature_data *data;
   char *label;
@@ -121 +109 @@
   a = 0;
   while((data=sensors_get_all_features(*name, &a))) {
-    if (sensors_get_label_and_valid(*name,data->number,&label,&valid)) {
+    if (sensors_get_label(*name, data->number, &label)) {
       printf("ERROR: Can't get feature `%s' data!\n",data->name);
       continue;
     }
-    if (! valid)
-      continue;
     if (data->mode & SENSORS_MODE_R) {
       if(sensors_get_feature(*name,data->number,&val)) {

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

@@ -39 +39 @@
 void print_label(const char *label, int space);
 
-int sensors_get_label_and_valid(sensors_chip_name name, int feature, char **label,
-                        int *valid);
 #endif /* def PROG_SENSORS_CHIPS_H */

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

@@ -63 +63 @@
 static int sensors_get_label_size(const sensors_chip_name *name)
 {
-  int i, valid;
+  int i;
   const sensors_feature_data *iter;
   char *label;
@@ -70 +70 @@
   i = 0;
   while((iter = sensors_get_all_features(*name, &i))) {
-    if (!sensors_get_label_and_valid(*name, iter->number, &label, &valid) &&
-        valid && strlen(label) > max_size)
+    if (!sensors_get_label(*name, iter->number, &label) &&
+        strlen(label) > max_size)
       max_size = strlen(label);
     free(label);
@@ -94 +94 @@
   double val, max, min;
   char *label;
-  int valid, type;
+  int type;
   const int size = SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP;
   short has_features[SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP] = {0, };
   double feature_vals[SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP] = {0.0, };
   
-  if (sensors_get_label_and_valid(*name, feature->number, &label, &valid)) {
-    free(label);
-    printf("ERROR: Can't get temperature data!\n");
-    return;
-  } else if (!valid) {
-    free(label);
-    return; /* ignored */
+  if (sensors_get_label(*name, feature->number, &label)) {
+    free(label);
+    printf("ERROR: Can't get temperature label!\n");
+    return;
   }
   
@@ -211 +208 @@
 {
   const int size = SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN;
-  int valid;
   short has_features[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN] = {0, };
   double feature_vals[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN] = {0.0, };
@@ -217 +213 @@
   char *label;
   
-  if (sensors_get_label_and_valid(*name, feature->number, &label, &valid)) {
-    free(label);
-    printf("ERROR: Can't get in data!\n");
-    return;
-  } else if (!valid) {
-    free(label);
-    return; /* ignored */
+  if (sensors_get_label(*name, feature->number, &label)) {
+    free(label);
+    printf("ERROR: Can't get in label!\n");
+    return;
   }
   
@@ -278 +271 @@
 {
   char *label;
-  int valid;
   const int size = SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN;
   short has_features[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN] = {0, };
@@ -284 +276 @@
   double val;
   
-  if (sensors_get_label_and_valid(*name, feature->number, &label, &valid)) {
-    printf("ERROR: Can't get fan data!\n");
-    free(label);
-    return;
-  } else if (!valid) {
-    free(label);
-    return; /* ignored */
+  if (sensors_get_label(*name, feature->number, &label)) {
+    printf("ERROR: Can't get fan label!\n");
+    free(label);
+    return;
   }