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 #3344 from Self-Perfection/patch-2
[collectd.git]
/
src
/
mqtt.c
diff --git
a/src/mqtt.c
b/src/mqtt.c
index
48c34ed
..
a44f4c8
100644
(file)
--- a/
src/mqtt.c
+++ b/
src/mqtt.c
@@
-31,8
+31,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include "utils_complain.h"
#include <mosquitto.h>
#include "utils_complain.h"
#include <mosquitto.h>
@@
-462,7
+462,7
@@
static int format_topic(char *buf, size_t buf_len, data_set_t const *ds,
if (status != 0)
return status;
if (status != 0)
return status;
- status = snprintf(buf, buf_len, "%s/%s", conf->topic_prefix, name);
+ status = s
s
nprintf(buf, buf_len, "%s/%s", conf->topic_prefix, name);
if ((status < 0) || (((size_t)status) >= buf_len))
return ENOMEM;
if ((status < 0) || (((size_t)status) >= buf_len))
return ENOMEM;
@@
-599,7
+599,7
@@
static int mqtt_config_publisher(oconfig_item_t *ci) {
ERROR("mqtt plugin: Unknown config option: %s", child->key);
}
ERROR("mqtt plugin: Unknown config option: %s", child->key);
}
- snprintf(cb_name, sizeof(cb_name), "mqtt/%s", conf->name);
+ s
s
nprintf(cb_name, sizeof(cb_name), "mqtt/%s", conf->name);
plugin_register_write(cb_name, mqtt_write,
&(user_data_t){
.data = conf,
plugin_register_write(cb_name, mqtt_write,
&(user_data_t){
.data = conf,