diff options
author | Jean Delvare <khali@linux-fr.org> | 2007-12-11 22:56:47 +0000 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2007-12-11 22:56:47 +0000 |
commit | b029b8f861ef4e498f6f9dde9be826252bee8ff1 (patch) | |
tree | 53045848f41ab05ecba65cfc0d3765dd838dc5d0 | |
parent | 9dbde1cc06745f9f97782605b31a079d0e264ec2 (diff) | |
download | lm-sensors-git-b029b8f861ef4e498f6f9dde9be826252bee8ff1.tar.gz |
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.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5072 7894878c-1315-0410-8ee3-d5d059ff63e0
-rw-r--r-- | CHANGES | 1 | ||||
-rw-r--r-- | INSTALL | 2 | ||||
-rw-r--r-- | prog/sensord/rrd.c | 9 |
3 files changed, 2 insertions, 10 deletions
@@ -10,6 +10,7 @@ SVN Warn about outputs found in automatic mode 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 3.0.0 (2007-11-24) @@ -18,7 +18,7 @@ Build-time dependencies: Run-time dependencies: * perl (for sensors-detect) -* rrd (optional, for sensord) +* rrdtool >= 1.2.1 (optional, for sensord) * proper kernel configuration (see below) diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c index a6021f51..1afee522 100644 --- a/prog/sensord/rrd.c +++ b/prog/sensord/rrd.c @@ -40,7 +40,6 @@ #include <sys/stat.h> #include <sys/types.h> -#include <getopt.h> #include <rrd.h> #include "sensord.h" @@ -251,10 +250,6 @@ rrdInit argc += num; 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 ()); } @@ -417,10 +412,6 @@ rrdUpdate const char *argv[] = { "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 ()); } |