Fix this (a pointer was compared with an integer):

[collectd.git] / src / swap.c

diff --git a/src/swap.c b/src/swap.c
index 9667b58..0891503 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/swap.c
- * Copyright (C) 2005  Florian octo Forster
+ * Copyright (C) 2005,2006  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -32,9 +32,9 @@
 # define SWAP_HAVE_READ 0
 #endif
 
-#ifdef KERNEL_SOLARIS
-#include <sys/swap.h>
-#endif /* KERNEL_SOLARIS */
+#if HAVE_SYS_SWAP_H
+# include <sys/swap.h>
+#endif
 
 #undef  MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
@@ -44,10 +44,10 @@ static char *swap_file = "swap.rrd";
 /* 1099511627776 == 1TB ought to be enough for anyone ;) */
 static char *ds_def[] =
 {
-       "DS:used:GAUGE:25:0:1099511627776",
-       "DS:free:GAUGE:25:0:1099511627776",
-       "DS:cached:GAUGE:25:0:1099511627776",
-       "DS:resv:GAUGE:25:0:1099511627776",
+       "DS:used:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+       "DS:free:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+       "DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+       "DS:resv:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
        NULL
 };
 static int ds_num = 4;
@@ -74,6 +74,7 @@ static void swap_write (char *host, char *inst, char *val)
        rrd_update_file (host, swap_file, val, ds_def, ds_num);
 }
 
+#if SWAP_HAVE_READ
 static void swap_submit (unsigned long long swap_used,
                unsigned long long swap_free,
                unsigned long long swap_cached,
@@ -81,14 +82,13 @@ static void swap_submit (unsigned long long swap_used,
 {
        char buffer[512];
 
-       if (snprintf (buffer, 512, "N:%llu:%llu:%llu:%llu", swap_used,
-                               swap_free, swap_cached, swap_resv) >= 512)
+       if (snprintf (buffer, 512, "%u:%llu:%llu:%llu:%llu", (unsigned int) curtime,
+                               swap_used, swap_free, swap_cached, swap_resv) >= 512)
                return;
 
        plugin_submit (MODULE_NAME, "-", buffer);
 }
 
-#if SWAP_HAVE_READ
 static void swap_read (void)
 {
 #ifdef KERNEL_LINUX