Changeset 5072

Timestamp:

12/11/07 23:56:47 (1 year ago)

Author:

khali

Message:

sensord: Drop workaround needed by old versions of rrdtool. The bug
(missing getopt variables initialization) was fixed in rrdtool version
1.2.1, 2.5 years ago.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/CHANGES (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/INSTALL (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c (modified) (3 diffs)

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

@@ -11 +11 @@
-  sensord: Fix rrd support (#2276)
-           Use the same colors for daily and weekly charts
+           Drop workaround needed by old versions of rrdtool
-  sensors-detect: Drop PCA9540 detection
-

lm-sensors/branches/lm-sensors-3.0.0/INSTALL

@@ -19 +19 @@
-Run-time dependencies:
-* perl (for sensors-detect)
-
+tool >= 1.2.1
-* proper kernel configuration (see below)
-

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

@@ -41 +41 @@
-#include <sys/types.h>
-
-#include <getopt.h>
-#include <rrd.h>
-
@@ -252 +251 @@
-        argv[argc ++] = rraBuff;
-        argv[argc] = NULL;
-        optind = 1;
-        opterr = 0;
-        optopt = '?';
-        optarg = NULL;
-        if ((ret = rrd_create (argc, (char **) /* WEAK */ argv))) {
-          sensorLog (LOG_ERR, "Error creating RRD file: %s: %s", rrdFile, rrd_get_error ());
@@ -418 +413 @@
-      "sensord", rrdFile, rrdBuff, NULL
-    };
-    optind = 1;
-    opterr = 0;
-    optopt = '?';
-    optarg = NULL;
-    if ((ret = rrd_update (3, (char **) /* WEAK */ argv))) {
-      sensorLog (LOG_ERR, "Error updating RRD file: %s: %s", rrdFile, rrd_get_error ());