projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: use designated initializers for ai_hints
[collectd.git]
/
src
/
ted.c
diff --git
a/src/ted.c
b/src/ted.c
index
bf519bb
..
282212b
100644
(file)
--- a/
src/ted.c
+++ b/
src/ted.c
@@
-70,11
+70,15
@@
static int ted_read_value(double *ret_power, double *ret_voltage)
{
unsigned char receive_buffer[300];
unsigned char package_buffer[300];
{
unsigned char receive_buffer[300];
unsigned char package_buffer[300];
- char pkt_request[1] = {0xAA};
+
unsigned
char pkt_request[1] = {0xAA};
int package_buffer_pos;
fd_set input;
int package_buffer_pos;
fd_set input;
- struct timeval timeout;
+
+ /* Initialize timeout structure, set to 2 seconds */
+ struct timeval timeout = {
+ .tv_sec = 2
+ };
int end_flag;
int escape_flag;
int end_flag;
int escape_flag;
@@
-87,11
+91,6
@@
static int ted_read_value(double *ret_power, double *ret_voltage)
FD_ZERO (&input);
FD_SET (fd, &input);
FD_ZERO (&input);
FD_SET (fd, &input);
- /* Initialize timeout structure, set to 2 seconds */
- memset (&timeout, 0, sizeof (timeout));
- timeout.tv_sec = 2;
- timeout.tv_usec = 0;
-
/* clear out anything in the buffer */
tcflush (fd, TCIFLUSH);
/* clear out anything in the buffer */
tcflush (fd, TCIFLUSH);
@@
-104,7
+103,6
@@
static int ted_read_value(double *ret_power, double *ret_voltage)
/* Loop until we find the end of the package */
end_flag = 0;
/* Loop until we find the end of the package */
end_flag = 0;
- escape_flag = 0;
package_buffer_pos = 0;
while (end_flag == 0)
{
package_buffer_pos = 0;
while (end_flag == 0)
{
@@
-148,7
+146,7
@@
static int ted_read_value(double *ret_power, double *ret_voltage)
WARNING ("ted plugin: Received EOF from file descriptor.");
return (-1);
}
WARNING ("ted plugin: Received EOF from file descriptor.");
return (-1);
}
- else if (
receive_buffer_length
> sizeof (receive_buffer))
+ else if (
((size_t) receive_buffer_length)
> sizeof (receive_buffer))
{
ERROR ("ted plugin: read(2) returned invalid value %zi.",
receive_buffer_length);
{
ERROR ("ted plugin: read(2) returned invalid value %zi.",
receive_buffer_length);
@@
-264,7
+262,7
@@
static int ted_open_device (void)
return (0);
} /* int ted_open_device */
return (0);
} /* int ted_open_device */
-static void ted_submit (char *type, double value)
+static void ted_submit (c
onst c
har *type, double value)
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;