Changeset 5793

Timestamp:

11/04/09 20:07:38 (4 years ago)

Author:

andy

Message:

sensord: Change signature of (*FeatureFN)

This patch changes the signature of function pointer (*FeatureFN) and
the related functions:

rrdGetSensors_DS()
rrdCGI_DEF()
rrdCGI_LINE()

Return type is now void because none of the functions return an error
code.

Files:

• lm-sensors/trunk/prog/sensord/rrd.c (modified) (11 diffs)

lm-sensors/trunk/prog/sensord/rrd.c

@@ -69 +69 @@
 #define LOAD_AVERAGE "Load Average"
 
-typedef int (*FeatureFN) (void *data, const char *rawLabel, const char *label,
-                          const FeatureDescriptor *feature);
+typedef void (*FeatureFN) (void *data, const char *rawLabel, const char *label,
+                           const FeatureDescriptor *feature);
 
 static char rrdNextChar(char c)
@@ -142 +142 @@
                             const ChipDescriptor *desc)
 {
-        int i, ret;
+        int i;
         const FeatureDescriptor *features = desc->features;
         const FeatureDescriptor *feature;
@@ -160 +160 @@
 
                 rrdCheckLabel(rawLabel, i);
-                ret = fn(data, rrdLabels[i], label, feature);
+                fn(data, rrdLabels[i], label, feature);
                 free(label);
         }
@@ -211 +211 @@
 };
 
-static int rrdGetSensors_DS(void *_data, const char *rawLabel,
-                            const char *label,
-                            const FeatureDescriptor *feature)
+static void rrdGetSensors_DS(void *_data, const char *rawLabel,
+                             const char *label,
+                             const FeatureDescriptor *feature)
 {
         (void) label; /* no warning */
@@ -248 +248 @@
                         sensord_args.rrdTime, min, max);
         }
-        return 0;
 }
 
@@ -257 +256 @@
         ret = applyToFeatures(rrdGetSensors_DS, &data);
         if (!ret && sensord_args.doLoad)
-                ret = rrdGetSensors_DS(&data, LOADAVG, LOAD_AVERAGE, NULL);
+                rrdGetSensors_DS(&data, LOADAVG, LOAD_AVERAGE, NULL);
         return ret ? -1 : data.num;
 }
@@ -324 +323 @@
 };
 
-static int rrdCGI_DEF(void *_data, const char *rawLabel, const char *label,
-                      const FeatureDescriptor *feature)
+static void rrdCGI_DEF(void *_data, const char *rawLabel, const char *label,
+                       const FeatureDescriptor *feature)
 {
         struct gr *data = _data;
@@ -332 +331 @@
                 printf("\n\tDEF:%s=%s:%s:AVERAGE", rawLabel,
                        sensord_args.rrdFile, rawLabel);
-        return 0;
 }
 
@@ -360 +358 @@
 }
 
-static int rrdCGI_LINE(void *_data, const char *rawLabel, const char *label,
-                       const FeatureDescriptor *feature)
+static void rrdCGI_LINE(void *_data, const char *rawLabel, const char *label,
+                        const FeatureDescriptor *feature)
 {
         struct gr *data = _data;
@@ -367 +365 @@
                 printf("\n\tLINE2:%s#%.6x:\"%s\"", rawLabel,
                        rrdCGI_color(label), label);
-        return 0;
 }
 
@@ -489 +486 @@
                         ret = applyToFeatures(rrdCGI_DEF, graph);
                 if (!ret && sensord_args.doLoad && graph->loadAvg)
-                        ret = rrdCGI_DEF(graph, LOADAVG, LOAD_AVERAGE, NULL);
+                        rrdCGI_DEF(graph, LOADAVG, LOAD_AVERAGE, NULL);
                 if (!ret)
                         ret = applyToFeatures(rrdCGI_LINE, graph);
                 if (!ret && sensord_args.doLoad && graph->loadAvg)
-                        ret = rrdCGI_LINE(graph, LOADAVG, LOAD_AVERAGE, NULL);
+                        rrdCGI_LINE(graph, LOADAVG, LOAD_AVERAGE, NULL);
                 printf (">\n</p>\n");
         }