projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1856 from rubenk/snmp-dont-dispatch-values-with-empty-type-instance
[collectd.git]
/
src
/
multimeter.c
diff --git
a/src/multimeter.c
b/src/multimeter.c
index
775eb57
..
02fe1ad
100644
(file)
--- a/
src/multimeter.c
+++ b/
src/multimeter.c
@@
-23,6
+23,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-148,22
+149,21
@@
static int multimeter_read_value(double *value)
static int multimeter_init (void)
{
static int multimeter_init (void)
{
- int i;
char device[] = "/dev/ttyS ";
char device[] = "/dev/ttyS ";
- for (i = 0; i < 10; i++)
+ for (i
nt i
= 0; i < 10; i++)
{
{
- device[strlen(device)-1] = i + '0';
+ device[strlen(device)-1] = i + '0';
- if ((fd = open(device, O_RDWR | O_NOCTTY))
> 0
)
+ if ((fd = open(device, O_RDWR | O_NOCTTY))
!= -1
)
{
{
- struct termios tios;
+ struct termios tios
= { 0 }
;
int rts = TIOCM_RTS;
double value;
tios.c_cflag = B1200 | CS7 | CSTOPB | CREAD | CLOCAL;
tios.c_iflag = IGNBRK | IGNPAR;
int rts = TIOCM_RTS;
double value;
tios.c_cflag = B1200 | CS7 | CSTOPB | CREAD | CLOCAL;
tios.c_iflag = IGNBRK | IGNPAR;
- tios.c_oflag = 0;
+ tios.c_oflag = 0;
tios.c_lflag = 0;
tios.c_cc[VTIME] = 3;
tios.c_cc[VMIN] = LINE_LENGTH;
tios.c_lflag = 0;
tios.c_cc[VTIME] = 3;
tios.c_cc[VMIN] = LINE_LENGTH;
@@
-171,7
+171,7
@@
static int multimeter_init (void)
tcflush(fd, TCIFLUSH);
tcsetattr(fd, TCSANOW, &tios);
ioctl(fd, TIOCMBIC, &rts);
tcflush(fd, TCIFLUSH);
tcsetattr(fd, TCSANOW, &tios);
ioctl(fd, TIOCMBIC, &rts);
-
+
if (multimeter_read_value (&value) < -1)
{
close (fd);
if (multimeter_read_value (&value) < -1)
{
close (fd);