X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fserial.c;h=31b6148e1da6f483ccb3c08934075fe3acfa45ba;hb=327ea9f5f8275f21db31a1c7af9d5897feadb16a;hp=78210300fd0a234ded51d35d53bef21aaf5772a4;hpb=a82ff6683f0011a498b4fc0947833d2e28925b76;p=collectd.git

diff --git a/src/serial.c b/src/serial.c
index 78210300..31b6148e 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -21,13 +21,17 @@
  *   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";
 
@@ -39,11 +43,12 @@ static char *ds_def[] =
 };
 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 */