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 #3339 from jkohen/patch-1
[collectd.git]
/
src
/
ceph.c
diff --git
a/src/ceph.c
b/src/ceph.c
index
c112af0
..
8048f5d
100644
(file)
--- a/
src/ceph.c
+++ b/
src/ceph.c
@@
-28,8
+28,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <arpa/inet.h>
#include <errno.h>
#include <arpa/inet.h>
#include <errno.h>
@@
-251,7
+251,7
@@
static int ceph_cb_boolean(void *ctx, int bool_val) { return CEPH_CB_CONTINUE; }
if (dest_size > dest_len) { \
sstrncpy((dest) + dest_len, (src), dest_size - dest_len); \
} \
if (dest_size > dest_len) { \
sstrncpy((dest) + dest_len, (src), dest_size - dest_len); \
} \
- (dest)[dest_size - 1] =
0;
\
+ (dest)[dest_size - 1] =
'\0';
\
} while (0)
static int ceph_cb_number(void *ctx, const char *number_val,
} while (0)
static int ceph_cb_number(void *ctx, const char *number_val,
@@
-350,7
+350,7
@@
static int ceph_cb_map_key(void *ctx, const unsigned char *key,
}
memmove(state->key, key, sz - 1);
}
memmove(state->key, key, sz - 1);
- state->key[sz - 1] =
0
;
+ state->key[sz - 1] =
'\0'
;
return CEPH_CB_CONTINUE;
}
return CEPH_CB_CONTINUE;
}
@@
-990,7
+990,7
@@
static int cconn_connect(struct cconn *io) {
return err;
}
address.sun_family = AF_UNIX;
return err;
}
address.sun_family = AF_UNIX;
- snprintf(address.sun_path, sizeof(address.sun_path), "%s", io->d->asok_path);
+ s
s
nprintf(address.sun_path, sizeof(address.sun_path), "%s", io->d->asok_path);
RETRY_ON_EINTR(err, connect(fd, (struct sockaddr *)&address,
sizeof(struct sockaddr_un)));
if (err < 0) {
RETRY_ON_EINTR(err, connect(fd, (struct sockaddr *)&address,
sizeof(struct sockaddr_un)));
if (err < 0) {
@@
-1153,8
+1153,8
@@
static ssize_t cconn_handle_event(struct cconn *io) {
return -EDOM;
case CSTATE_WRITE_REQUEST: {
char cmd[32];
return -EDOM;
case CSTATE_WRITE_REQUEST: {
char cmd[32];
- snprintf(cmd, sizeof(cmd), "%s%d%s", "{ \"prefix\": \"", io->request_type,
- "\" }\n");
+ s
s
nprintf(cmd, sizeof(cmd), "%s%d%s", "{ \"prefix\": \"", io->request_type,
+
"\" }\n");
size_t cmd_len = strlen(cmd);
RETRY_ON_EINTR(
ret, write(io->asok, ((char *)&cmd) + io->amt, cmd_len - io->amt));
size_t cmd_len = strlen(cmd);
RETRY_ON_EINTR(
ret, write(io->asok, ((char *)&cmd) + io->amt, cmd_len - io->amt));