projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge upstream, address conflict in src/utils/cmds/cmds_test.c
[collectd.git]
/
src
/
amqp1.c
diff --git
a/src/amqp1.c
b/src/amqp1.c
index
a7fd26b
..
601f0ae
100644
(file)
--- a/
src/amqp1.c
+++ b/
src/amqp1.c
@@
-624,13
+624,13
@@
static int amqp1_config_instance(oconfig_item_t *ci) /* {{{ */
return status;
} else {
char tpname[DATA_MAX_NAME_LEN];
return status;
} else {
char tpname[DATA_MAX_NAME_LEN];
- status = snprintf(tpname, sizeof(tpname), "amqp1/%s", instance->name);
+ status = s
s
nprintf(tpname, sizeof(tpname), "amqp1/%s", instance->name);
if ((status < 0) || (size_t)status >= sizeof(tpname)) {
ERROR("amqp1 plugin: Instance name would have been truncated.");
return -1;
}
if ((status < 0) || (size_t)status >= sizeof(tpname)) {
ERROR("amqp1 plugin: Instance name would have been truncated.");
return -1;
}
- status = snprintf(instance->send_to, sizeof(instance->send_to), "/%s/%s",
- transport->address, instance->name);
+ status = s
s
nprintf(instance->send_to, sizeof(instance->send_to), "/%s/%s",
+
transport->address, instance->name);
if ((status < 0) || (size_t)status >= sizeof(instance->send_to)) {
ERROR("amqp1 plugin: send_to address would have been truncated.");
return -1;
if ((status < 0) || (size_t)status >= sizeof(instance->send_to)) {
ERROR("amqp1 plugin: send_to address would have been truncated.");
return -1;