projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into pri
[collectd.git]
/
src
/
modbus.c
diff --git
a/src/modbus.c
b/src/modbus.c
index
715724d
..
31f0c2d
100644
(file)
--- a/
src/modbus.c
+++ b/
src/modbus.c
@@
-417,7
+417,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 %
zu
data sources. "
+ ERROR("Modbus plugin: The type \"%s\" has %
" PRIsz "
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;
@@
-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;
}