Changeset 4709

Timestamp:

08/26/07 13:45:46 (6 years ago)

Author:

khali

Message:

libsensors no longer returns ignored features so no need to check for
this in applications anymore.

Location:

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

Files:

• rrd.c (modified) (2 diffs)
• sense.c (modified) (3 diffs)
• sensord.h (modified) (1 diff)

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

@@ -156 +156 @@
           const char *rawLabel = NULL;
           char *label = NULL;
-          int valid = 0;
-          if (getValid (chip, labelNumber, &valid)) {
-            sensorLog (LOG_ERR, "Error getting sensor validity: %s/#%d", chip->prefix, labelNumber);
-            ret = -1;
-          } else if (getRawLabel (chip, labelNumber, &rawLabel)) {
+
+          if (getRawLabel (chip, labelNumber, &rawLabel)) {
             sensorLog (LOG_ERR, "Error getting raw sensor label: %s/#%d", chip->prefix, labelNumber);
             ret = -1;
@@ -166 +163 @@
             sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
             ret = -1;
-          } else if (valid) {
+          } else  {
             rrdCheckLabel (rawLabel, num);
             ret = fn (data, rrdLabels[num], label, feature);

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

@@ -33 +33 @@
 #define DO_SET 2
 #define DO_RRD 3
-
-int
-getValid
-(const sensors_chip_name *name, int feature, int *valid) {
-  int err;
-  err = sensors_get_ignored (name, feature);
-  if (err >= 0) {
-    *valid = err;
-    err = 0;
-  }
-  return err;
-}
 
 int
@@ -96 +84 @@
   while ((ret == 0) && ((sensor = sensors_get_all_features (chip, &index0, &index1)) != NULL)) {
     char *label = NULL;
-    int valid = 0;
     double value;
     
-    if (getValid (chip, sensor->number, &valid)) {
-      sensorLog (LOG_ERR, "Error getting sensor validity: %s/%s", chip->prefix, sensor->name);
-      ret = 20;
-    } else if (!(label = sensors_get_label (chip, sensor->number))) {
+    if (!(label = sensors_get_label (chip, sensor->number))) {
       sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, sensor->name);
       ret = 21;
-    } else if (!valid) {
-      /* skip invalid */
     } else if (!(sensor->mode & SENSORS_MODE_R)) {
       sensorLog (LOG_INFO, "%s: %s", sensor->name, label);
@@ -155 +137 @@
     int beep = beeps & feature->beepMask;
     char *label = NULL;
-    int valid = 0;
 
     if ((action == DO_SCAN) && !alarm) {
       continue;
-    } else if (getValid (chip, labelNumber, &valid)) {
-      sensorLog (LOG_ERR, "Error getting sensor validity: %s/#%d", chip->prefix, labelNumber);
-      ret = 22;
     } else if (!(label = sensors_get_label (chip, labelNumber))) {
       sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
       ret = 22;
-    } else if (valid) {
+    } else {
       double values[MAX_DATA];
 

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

@@ -59 +59 @@
 /* from sense.c */
 
-extern int getValid (const sensors_chip_name *name, int feature, int *valid);
 extern int getRawLabel (const sensors_chip_name *name, int feature, const char **label);