removed

	extern time_t curtime;
in all modules (is present in src/collectd.h).

diff --git a/configure.in b/configure.in
index 99895a5f80b1729b30829585050b314411190265..e0ce88a0ebee70b25422d247bbe5e819904ad8c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -312,6 +312,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"])
@@ -352,6 +354,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 830f8acec97402e1fb2f3962514e3a5d4d63a984..7a9700aee9424d7042be88f4d32c5a1bec66b05d 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 7a6227ba33c7ec24d32c83fb75718aedcfe21db7..001ccec2c580972f9aad03a8a702c1d289624415 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 a6a583d294285ddd01fd412919c1e8964c29edd2..dc0232d4e8af39ba132ce0ed26c9faba74a2caca 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 4b749c1dfa040c7db9ba024f5a870a59fc16963f..64bd3008d161d25350c4fd6bca0b5986a207ce88 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 7b3462be51d0cd153036dff188372fb8a6bca4ec..d082816aee1a2598d8167819ba21f203c57e132a 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 3291bc870c4cfd6bb977f58a8f0f86921296a272..f7924456a3736a56b8ba88e64f10e8812fa05b0d 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 d21685c730c618b1a2dbb1299d34a04219c05591..3321630ae991ab6dc9427865eccd3bb9b92eb3ca 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 eb35360b5464b9f55f378b5bd18b21b840829a12..d418232f1498ef5986e53021c6952f1d19cf4a38 100644 (file)
--- a/src/ping.c
+++ b/src/ping.c
@@ -44,8 +44,6 @@ static char *ds_def[] =
 };
 static int ds_num = 1;
 
-extern time_t curtime;
-
 void ping_init (void)
 {
        int i;

diff --git a/src/processes.c b/src/processes.c
index c69b5ce8451ec29284238de79f41afaf671b94a7..821472bd95e34ae3620a42afa5091b5fb68fe6bb 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 390a7a04754b02c8f6c4fbb6ee37e805c485bc78..270ba035cfdfbbdf350fc00da36fa0b0eca5bfec 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 9d41fde60c5d38ed05f4ff6c44cfb3e9916a39d9..78210300fd0a234ded51d35d53bef21aaf5772a4 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 c0fba0cb00a022b0b6a138d3a7884992e54890c2..3697c6333aa8f4d6cfab06b1ec5a3e86fa27bb74 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 66f2b13359f47e6fd154c3dcc024343c8a826345..5a276a825dec02a7faa3d2a56cc823add5cb73f5 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 9e8dc34d5420693e47f0ce827efed4ec1415ceba..31c936c84d9ab018cb23756c74358677d2711d73 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 :-) */