projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
postgresql plugin: Register a new user data pointer with udb_query_set_user_data...
[collectd.git]
/
src
/
modbus.c
diff --git
a/src/modbus.c
b/src/modbus.c
index
887c63c
..
2cef4aa
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 */
@@
-414,7
+414,6
@@
static int mb_read_data (mb_host_t *host, mb_slave_t *slave, /* {{{ */
else
values_num = 1;
else
values_num = 1;
- status = 0;
if (host->connection == NULL)
{
status = EBADF;
if (host->connection == NULL)
{
status = EBADF;
@@
-677,7
+676,6
@@
static int mb_config_add_data (oconfig_item_t *ci) /* {{{ */
for (i = 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
for (i = 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
- status = 0;
if (strcasecmp ("Type", child->key) == 0)
status = cf_util_get_string_buffer (child,
if (strcasecmp ("Type", child->key) == 0)
status = cf_util_get_string_buffer (child,
@@
-816,7
+814,6
@@
static int mb_config_add_slave (mb_host_t *host, oconfig_item_t *ci) /* {{{ */
for (i = 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
for (i = 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
- status = 0;
if (strcasecmp ("Instance", child->key) == 0)
status = cf_util_get_string_buffer (child,
if (strcasecmp ("Instance", child->key) == 0)
status = cf_util_get_string_buffer (child,
@@
-867,9
+864,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++)
{