Merged revision 304 (removal of all `extern time_t curtime' in all plugins) to the...

diff --git a/configure.in b/configure.in
index 863a76c..d049602 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -313,6 +313,8 @@ fi
 #
 # Check for enabled/disabled features
 #
+m4_divert_once([HELP_ENABLE], [
+collectd features:])
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
        [Enable debugging (disabled by default)]),
        [], [enable_debug="no"])
@@ -353,6 +355,8 @@ AC_DEFINE_UNQUOTED(COLLECT_DAEMON, [$collect_daemon],
        [Wether or not to enable daemon mode])
 AM_CONDITIONAL(BUILD_DAEMON, test "x$enable_daemon" = "xyes")
 
+m4_divert_once([HELP_ENABLE], [
+collectd modules:])
 AC_ARG_ENABLE(cpu, AC_HELP_STRING([--disable-cpu], [Disable CPU usage statistics]),, [enable_cpu="yes"])
 if test "x$enable_cpu" != "xno"
 then

diff --git a/src/cpu.c b/src/cpu.c
index 830f8ac..7a9700a 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -76,8 +76,6 @@ static char *ds_def[] =
 };
 static int ds_num = 5;
 
-extern time_t curtime;
-
 void cpu_init (void)
 {
 #ifdef HAVE_LIBKSTAT

diff --git a/src/cpufreq.c b/src/cpufreq.c
index 7a6227b..001ccec 100644 (file)
--- a/src/cpufreq.c
+++ b/src/cpufreq.c
@@ -43,8 +43,6 @@ static char *ds_def[] =
 };
 static int ds_num = 1;
 
-extern time_t curtime;
-
 #define BUFSIZE 256
 
 void cpufreq_init (void)

diff --git a/src/disk.c b/src/disk.c
index a6a583d..dc0232d 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -80,8 +80,6 @@ static char *part_ds_def[] =
 };
 static int part_ds_num = 4;
 
-extern time_t curtime;
-
 void disk_init (void)
 {
 #ifdef HAVE_LIBKSTAT

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 4b749c1..64bd300 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -61,8 +61,6 @@ static char *ds_def[] =
 };
 static int ds_num = 1;
 
-extern time_t curtime;
-
 typedef struct hddname
 {
        int major;

diff --git a/src/load.c b/src/load.c
index 7b3462b..d082816 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -51,8 +51,6 @@ static char *ds_def[] =
 };
 static int ds_num = 3;
 
-extern time_t curtime;
-
 void load_init (void)
 {
        return;

diff --git a/src/memory.c b/src/memory.c
index 3291bc8..f792445 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -46,8 +46,6 @@ static int pagesize;
 static kstat_t *ksp;
 #endif /* HAVE_LIBKSTAT */
 
-extern time_t curtime;
-
 void memory_init (void)
 {
 #ifdef HAVE_LIBKSTAT

diff --git a/src/nfs.c b/src/nfs.c
index d21685c..3321630 100644 (file)
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -141,8 +141,6 @@ static kstat_t *nfs4_ksp_server;
 
 /* Possibly TODO: NFSv4 statistics */
 
-extern time_t curtime;
-
 void nfs_init (void)
 {
 #ifdef HAVE_LIBKSTAT

diff --git a/src/ping.c b/src/ping.c
index 9c318ce..e6456f8 100644 (file)
--- a/src/ping.c
+++ b/src/ping.c
@@ -52,8 +52,6 @@ static char *config_keys[] =
 };
 static int config_keys_num = 1;
 
-extern time_t curtime;
-
 void ping_init (void)
 {
        int i;

diff --git a/src/processes.c b/src/processes.c
index c69b5ce..821472b 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -43,8 +43,6 @@ static char *ds_def[] =
 };
 static int ds_num = 6;
 
-extern time_t curtime;
-
 void ps_init (void)
 {
 }

diff --git a/src/sensors.c b/src/sensors.c
index 390a7a0..270ba03 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -48,8 +48,6 @@ static char *ds_def[] =
 };
 static int ds_num = 1;
 
-extern time_t curtime;
-
 void collectd_sensors_init (void)
 {
        FILE *fh;

diff --git a/src/serial.c b/src/serial.c
index 9d41fde..7821030 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -63,7 +63,6 @@ void serial_submit (char *device,
                unsigned long long outgoing)
 {
        char buf[BUFSIZE];
-        time_t curtime = time(NULL);
         
        if (snprintf (buf, BUFSIZE, "%u:%llu:%llu", (unsigned int) curtime,
                                incoming, outgoing) >= BUFSIZE)

diff --git a/src/tape.c b/src/tape.c
index c0fba0c..3697c63 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -52,8 +52,6 @@ static char *tape_ds_def[] =
 };
 static int tape_ds_num = 8;
 
-extern time_t curtime;
-
 void tape_init (void)
 {
 #ifdef HAVE_LIBKSTAT

diff --git a/src/traffic.c b/src/traffic.c
index 66f2b13..5a276a8 100644 (file)
--- a/src/traffic.c
+++ b/src/traffic.c
@@ -45,8 +45,6 @@ static char *ds_def[] =
 };
 static int ds_num = 2;
 
-extern time_t curtime;
-
 void traffic_init (void)
 {
 #ifdef HAVE_LIBKSTAT

diff --git a/src/users.c b/src/users.c
index 9e8dc34..31c936c 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -42,8 +42,6 @@ static char *ds_def[] = {
 };
 static int ds_num = 1;
 
-extern time_t curtime;
-
 void users_init(void)
 {
     /* we have nothing to do here :-) */