solaris-fixes branch: Applied the swap-patch by Christophe Kalt.

[collectd.git] / src / serial.c

diff --git a/src/serial.c b/src/serial.c
index 7821030..0c6050d 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/serial.c
- * Copyright (C) 2005  David Bacher
+ * Copyright (C) 2005,2006  David Bacher
  *
  * 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
@@ -21,29 +21,34 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
-#include "serial.h"
+#include "collectd.h"
+#include "common.h"
+#include "plugin.h"
 
-#if COLLECT_SERIAL
 #define MODULE_NAME "serial"
 
-#include "plugin.h"
-#include "common.h"
+#if defined(KERNEL_LINUX)
+# define SERIAL_HAVE_READ 1
+#else
+# define SERIAL_HAVE_READ 0
+#endif
 
 static char *serial_filename_template = "serial-%s.rrd";
 
 static char *ds_def[] =
 {
-       "DS:incoming:COUNTER:25:0:U",
-       "DS:outgoing:COUNTER:25:0:U",
+       "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:U",
        NULL
 };
 static int ds_num = 2;
 
-void serial_init (void)
+static void serial_init (void)
 {
+       return;
 }
 
-void serial_write (char *host, char *inst, char *val)
+static void serial_write (char *host, char *inst, char *val)
 {
        char file[512];
        int status;
@@ -57,8 +62,9 @@ void serial_write (char *host, char *inst, char *val)
        rrd_update_file (host, file, val, ds_def, ds_num);
 }
 
+#if SERIAL_HAVE_READ
 #define BUFSIZE 512
-void serial_submit (char *device,
+static void serial_submit (char *device,
                unsigned long long incoming,
                unsigned long long outgoing)
 {
@@ -72,7 +78,7 @@ void serial_submit (char *device,
 }
 #undef BUFSIZE
 
-void serial_read (void)
+static void serial_read (void)
 {
 #ifdef KERNEL_LINUX
 
@@ -96,6 +102,13 @@ void serial_read (void)
        {
                int have_rx = 0, have_tx = 0;
 
+               /* stupid compiler:
+                * serial.c:87: warning: 'incoming' may be used uninitialized in this function
+                * serial.c:87: warning: 'outgoing' may be used uninitialized in this function
+                */
+               incoming = 0ULL;
+               outgoing = 0ULL;
+
                numfields = strsplit (buffer, fields, 16);
 
                if (numfields < 6)
@@ -139,6 +152,9 @@ void serial_read (void)
        fclose (fh);
 #endif /* KERNEL_LINUX */
 }
+#else
+# define serial_read NULL
+#endif /* SERIAL_HAVE_READ */
 
 void module_register (void)
 {
@@ -146,4 +162,3 @@ void module_register (void)
 }
 
 #undef MODULE_NAME
-#endif /* COLLECT_SERIAL */