X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fceph.c;h=26cf215553a1d20116b215a0db3d92ef9429f67f;hb=711f5b6c86f51061c21bedcaa46214a01de0125c;hp=c7fc576ad21683bd60e16e9a8cb3fb5328202886;hpb=a9191cc20f0a5af022ae1d9482af2eaf0098a46a;p=collectd.git diff --git a/src/ceph.c b/src/ceph.c index c7fc576a..26cf2155 100644 --- a/src/ceph.c +++ b/src/ceph.c @@ -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); \ } \ - (dest)[dest_size - 1] = 0; \ + (dest)[dest_size - 1] = '\0'; \ } 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); - state->key[sz - 1] = 0; + state->key[sz - 1] = '\0'; 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; - struct values_tmp *vtmp = calloc(1, sizeof(struct values_tmp) * 1); + struct values_tmp *vtmp = calloc(1, sizeof(*vtmp)); if (!vtmp) { return -ENOMEM; }