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 #1454 from rubenk/libi2c-dev-mark-as-linux-only
[collectd.git]
/
src
/
modbus.c
diff --git
a/src/modbus.c
b/src/modbus.c
index
ae88f01
..
d2b0a53
100644
(file)
--- a/
src/modbus.c
+++ b/
src/modbus.c
@@
-27,7
+27,7
@@
#include <netdb.h>
#include <netdb.h>
-#include <modbus
/modbus
.h>
+#include <modbus.h>
#ifndef LIBMODBUS_VERSION_CHECK
/* Assume version 2.0.3 */
#ifndef LIBMODBUS_VERSION_CHECK
/* Assume version 2.0.3 */
@@
-426,7
+426,7
@@
static int mb_read_data (mb_host_t *host, mb_slave_t *slave, /* {{{ */
uint16_t values[2];
int values_num;
const data_set_t *ds;
uint16_t values[2];
int values_num;
const data_set_t *ds;
- int status;
+ int status
= 0
;
if ((host == NULL) || (slave == NULL) || (data == NULL))
return (EINVAL);
if ((host == NULL) || (slave == NULL) || (data == NULL))
return (EINVAL);
@@
-440,7
+440,7
@@
static int mb_read_data (mb_host_t *host, mb_slave_t *slave, /* {{{ */
if (ds->ds_num != 1)
{
if (ds->ds_num != 1)
{
- ERROR ("Modbus plugin: The type \"%s\" has %
i
data sources. "
+ ERROR ("Modbus plugin: The type \"%s\" has %
zu
data sources. "
"I can only handle data sets with only one data source.",
data->type, ds->ds_num);
return (-1);
"I can only handle data sets with only one data source.",
data->type, ds->ds_num);
return (-1);
@@
-942,9
+942,15
@@
static int mb_config_add_host (oconfig_item_t *ci) /* {{{ */
status = cf_util_get_string_buffer (ci, host->host, sizeof (host->host));
if (status != 0)
status = cf_util_get_string_buffer (ci, host->host, sizeof (host->host));
if (status != 0)
+ {
+ sfree (host);
return (status);
return (status);
+ }
if (host->host[0] == 0)
if (host->host[0] == 0)
+ {
+ sfree (host);
return (EINVAL);
return (EINVAL);
+ }
for (i = 0; i < ci->children_num; i++)
{
for (i = 0; i < ci->children_num; i++)
{