X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_db_query.c;h=73c1b45ea0465055fa78bcb6cd17b2eb4ab93d42;hb=711f5b6c86f51061c21bedcaa46214a01de0125c;hp=0279a471768d2b65bd9edc2331a4866037af46c0;hpb=009c673408d3e05f8604b3fb818cf3358f984be3;p=collectd.git

diff --git a/src/utils_db_query.c b/src/utils_db_query.c
index 0279a471..73c1b45e 100644
--- a/src/utils_db_query.c
+++ b/src/utils_db_query.c
@@ -226,13 +226,13 @@ static int udb_result_submit(udb_result_t *r, /* {{{ */
             status);
         return status;
       }
-      tmp[sizeof(tmp) - 1] = 0;
+      tmp[sizeof(tmp) - 1] = '\0';
 
       snprintf(vl.type_instance, sizeof(vl.type_instance), "%s-%s",
                r->instance_prefix, tmp);
     }
   }
-  vl.type_instance[sizeof(vl.type_instance) - 1] = 0;
+  vl.type_instance[sizeof(vl.type_instance) - 1] = '\0';
   /* }}} */
 
   /* Annotate meta data. {{{ */
@@ -347,39 +347,42 @@ static int udb_result_prepare_result(udb_result_t const *r, /* {{{ */
    * r->instances_buffer, r->values_buffer, and r->metadata_buffer {{{ */
   if (r->instances_num > 0) {
     prep_area->instances_pos =
-        (size_t *)calloc(r->instances_num, sizeof(size_t));
+        calloc(r->instances_num, sizeof(*prep_area->instances_pos));
     if (prep_area->instances_pos == NULL) {
       P_ERROR("udb_result_prepare_result: calloc failed.");
       BAIL_OUT(-ENOMEM);
     }
 
     prep_area->instances_buffer =
-        (char **)calloc(r->instances_num, sizeof(char *));
+        calloc(r->instances_num, sizeof(*prep_area->instances_buffer));
     if (prep_area->instances_buffer == NULL) {
       P_ERROR("udb_result_prepare_result: calloc failed.");
       BAIL_OUT(-ENOMEM);
     }
   } /* if (r->instances_num > 0) */
 
-  prep_area->values_pos = (size_t *)calloc(r->values_num, sizeof(size_t));
+  prep_area->values_pos = calloc(r->values_num, sizeof(*prep_area->values_pos));
   if (prep_area->values_pos == NULL) {
     P_ERROR("udb_result_prepare_result: calloc failed.");
     BAIL_OUT(-ENOMEM);
   }
 
-  prep_area->values_buffer = (char **)calloc(r->values_num, sizeof(char *));
+  prep_area->values_buffer =
+      calloc(r->values_num, sizeof(*prep_area->values_buffer));
   if (prep_area->values_buffer == NULL) {
     P_ERROR("udb_result_prepare_result: calloc failed.");
     BAIL_OUT(-ENOMEM);
   }
 
-  prep_area->metadata_pos = (size_t *)calloc(r->metadata_num, sizeof(size_t));
+  prep_area->metadata_pos =
+      calloc(r->metadata_num, sizeof(*prep_area->metadata_pos));
   if (prep_area->metadata_pos == NULL) {
     P_ERROR("udb_result_prepare_result: calloc failed.");
     BAIL_OUT(-ENOMEM);
   }
 
-  prep_area->metadata_buffer = (char **)calloc(r->metadata_num, sizeof(char *));
+  prep_area->metadata_buffer =
+      calloc(r->metadata_num, sizeof(*prep_area->metadata_buffer));
   if (prep_area->metadata_buffer == NULL) {
     P_ERROR("udb_result_prepare_result: calloc failed.");
     BAIL_OUT(-ENOMEM);