Renamed vserver-<xid>/threads.rrd to vserver-<xid>/vs_threads.rrd.

[collectd.git] / src / serial.c

diff --git a/src/serial.c b/src/serial.c
index 20a51e7..31b6148 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -62,6 +62,7 @@ static 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
 static void serial_submit (char *device,
                unsigned long long incoming,
@@ -77,7 +78,6 @@ static void serial_submit (char *device,
 }
 #undef BUFSIZE
 
-#if SERIAL_HAVE_READ
 static void serial_read (void)
 {
 #ifdef KERNEL_LINUX
@@ -152,17 +152,13 @@ static void serial_read (void)
        fclose (fh);
 #endif /* KERNEL_LINUX */
 }
+#else
+# define serial_read NULL
 #endif /* SERIAL_HAVE_READ */
 
 void module_register (void)
 {
-   plugin_register (MODULE_NAME, serial_init,
-#if SERIAL_HAVE_READ
-                  serial_read,
-#else
-                  NULL,
-#endif
-                  serial_write);
+   plugin_register (MODULE_NAME, serial_init, serial_read, serial_write);
 }
 
 #undef MODULE_NAME