projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-3.11' into collectd-4.0
[collectd.git]
/
src
/
serial.c
diff --git
a/src/serial.c
b/src/serial.c
index
0cfa382
..
dd063bb
100644
(file)
--- a/
src/serial.c
+++ b/
src/serial.c
@@
-31,17
+31,6
@@
# define SERIAL_HAVE_READ 0
#endif
# 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)
#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)
{
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);
}
return (-1);
}
@@
-136,9
+127,7
@@
static int serial_read (void)
void module_register (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 */
#if SERIAL_HAVE_READ
plugin_register_read ("serial", serial_read);
#endif /* SERIAL_HAVE_READ */
-}
+}
/* void module_register */