projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virt plugin: Skip 'last_update' reporting as that is not memory but timestamp
[collectd.git]
/
src
/
ceph.c
diff --git
a/src/ceph.c
b/src/ceph.c
index
c7fc576
..
19a09d8
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;
}
@@
-1032,7
+1032,7
@@
static void cconn_close(struct cconn *io) {
static int cconn_process_data(struct cconn *io, yajl_struct *yajl,
yajl_handle hand) {
int ret;
static int cconn_process_data(struct cconn *io, yajl_struct *yajl,
yajl_handle hand) {
int ret;
- struct values_tmp *vtmp = calloc(1, sizeof(
struct values_tmp) * 1
);
+ struct values_tmp *vtmp = calloc(1, sizeof(
*vtmp)
);
if (!vtmp) {
return -ENOMEM;
}
if (!vtmp) {
return -ENOMEM;
}