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-5.8'
[collectd.git]
/
src
/
modbus.c
diff --git
a/src/modbus.c
b/src/modbus.c
index
f45fe21
..
ad5e58e
100644
(file)
--- a/
src/modbus.c
+++ b/
src/modbus.c
@@
-248,7
+248,7
@@
static int mb_submit(mb_host_t *host, mb_slave_t *slave, /* {{{ */
host->interval = plugin_get_interval();
if (slave->instance[0] == 0)
host->interval = plugin_get_interval();
if (slave->instance[0] == 0)
- s
s
nprintf(slave->instance, sizeof(slave->instance), "slave_%i", slave->id);
+ snprintf(slave->instance, sizeof(slave->instance), "slave_%i", slave->id);
vl.values = &value;
vl.values_len = 1;
vl.values = &value;
vl.values_len = 1;
@@
-770,10
+770,8
@@
static int mb_config_set_host_address(mb_host_t *host, /* {{{ */
status = getaddrinfo(address, /* service = */ NULL, &ai_hints, &ai_list);
if (status != 0) {
status = getaddrinfo(address, /* service = */ NULL, &ai_hints, &ai_list);
if (status != 0) {
- char errbuf[1024];
ERROR("Modbus plugin: getaddrinfo failed: %s",
ERROR("Modbus plugin: getaddrinfo failed: %s",
- (status == EAI_SYSTEM) ? sstrerror(errno, errbuf, sizeof(errbuf))
- : gai_strerror(status));
+ (status == EAI_SYSTEM) ? STRERRNO : gai_strerror(status));
return status;
}
return status;
}
@@
-934,7
+932,7
@@
static int mb_config_add_host(oconfig_item_t *ci) /* {{{ */
if (status == 0) {
char name[1024];
if (status == 0) {
char name[1024];
- s
s
nprintf(name, sizeof(name), "modbus-%s", host->host);
+ snprintf(name, sizeof(name), "modbus-%s", host->host);
plugin_register_complex_read(/* group = */ NULL, name,
/* callback = */ mb_read,
plugin_register_complex_read(/* group = */ NULL, name,
/* callback = */ mb_read,