X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_db_query.c;h=d003e7fa389211b81026932819612970f7728875;hb=1ebf2f31bd2e080e6f42de640f0a3899a61501c0;hp=9c84937f38845c34e2f7067fab6317f7d052c3fe;hpb=dab48f284f9d4bb6ae98244310c5cdb6c5d91bf3;p=collectd.git diff --git a/src/utils_db_query.c b/src/utils_db_query.c index 9c84937f..d003e7fa 100644 --- a/src/utils_db_query.c +++ b/src/utils_db_query.c @@ -371,10 +371,10 @@ static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */ BAIL_OUT (-1); } - if (((size_t) prep_area->ds->ds_num) != r->values_num) + if (prep_area->ds->ds_num != r->values_num) { ERROR ("db query utils: udb_result_prepare_result: The type `%s' " - "requires exactly %i value%s, but the configuration specifies %zu.", + "requires exactly %zu value%s, but the configuration specifies %zu.", r->type, prep_area->ds->ds_num, (prep_area->ds->ds_num == 1) ? "" : "s", r->values_num); @@ -550,7 +550,7 @@ static int udb_result_create (const char *query_name, /* {{{ */ ci->values_num, (ci->values_num == 1) ? "" : "s"); } - r = (udb_result_t *) malloc (sizeof (*r)); + r = malloc (sizeof (*r)); if (r == NULL) { ERROR ("db query utils: malloc failed."); @@ -638,7 +638,7 @@ static int udb_result_create (const char *query_name, /* {{{ */ /* * Query private functions */ -void udb_query_free_one (udb_query_t *q) /* {{{ */ +static void udb_query_free_one (udb_query_t *q) /* {{{ */ { if (q == NULL) return; @@ -678,7 +678,7 @@ int udb_query_create (udb_query_t ***ret_query_list, /* {{{ */ return (-1); } - q = (udb_query_t *) malloc (sizeof (*q)); + q = malloc (sizeof (*q)); if (q == NULL) { ERROR ("db query utils: malloc failed.");