X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fserial.c;h=dd063bb53bd9a9707ae5bf2ea74cb9d5b4da03f5;hb=2b6176cab4f092354177473bbc74c5cdc2eaa2ec;hp=0cfa382309b0ba8655638f74f3cd5daeaee3fb7e;hpb=838af4cdc6c8674ed3e14a95fea172118c707a85;p=collectd.git diff --git a/src/serial.c b/src/serial.c index 0cfa3823..dd063bb5 100644 --- a/src/serial.c +++ b/src/serial.c @@ -31,17 +31,6 @@ # define SERIAL_HAVE_READ 0 #endif -static data_source_t octets_dsrc[2] = -{ - {"rx", DS_TYPE_COUNTER, 0, 4294967295.0}, - {"tx", DS_TYPE_COUNTER, 0, 4294967295.0} -}; - -static data_set_t octets_ds = -{ - "serial_octets", 2, octets_dsrc -}; - #if SERIAL_HAVE_READ static void serial_submit (const char *type_instance, counter_t rx, counter_t tx) @@ -80,7 +69,9 @@ static int serial_read (void) if ((fh = fopen ("/proc/tty/driver/serial", "r")) == NULL && (fh = fopen ("/proc/tty/driver/ttyS", "r")) == NULL) { - WARNING ("serial: fopen: %s", strerror (errno)); + char errbuf[1024]; + WARNING ("serial: fopen: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } @@ -136,9 +127,7 @@ static int serial_read (void) void module_register (void) { - plugin_register_data_set (&octets_ds); - #if SERIAL_HAVE_READ plugin_register_read ("serial", serial_read); #endif /* SERIAL_HAVE_READ */ -} +} /* void module_register */