Pass strcmp() to c_avl_create() as function pointer, not data one

Matches how strcmp() is passed to c_avl_create() elsewhere.

Reported by -Wpendantic.

Signed-off-by: Eero Tamminen <eero.t.tamminen@intel.com>

diff --git a/src/redfish.c b/src/redfish.c
index d2d77482071c6d3489d15cdaba56eb0df64e746e..c3cb85aa9a2d501760e62d896feeca24c714e13b 100644 (file)
--- a/src/redfish.c
+++ b/src/redfish.c
@@ -275,7 +275,7 @@ static int redfish_preconfig(void) {
     goto error;
 
   /* Creating placeholder for queries */
-  ctx.queries = c_avl_create((void *)strcmp);
+  ctx.queries = c_avl_create((int (*)(const void *, const void *))strcmp);
   if (ctx.services == NULL)
     goto free_services;
 

diff --git a/src/utils/format_stackdriver/format_stackdriver.c b/src/utils/format_stackdriver/format_stackdriver.c
index 0900361b3bc0dde1a713ffa6a77f6d5ee92ae230..6e2e4e226274ee8a6672746132eeaee5c875aae6 100644 (file)
--- a/src/utils/format_stackdriver/format_stackdriver.c
+++ b/src/utils/format_stackdriver/format_stackdriver.c
@@ -492,13 +492,14 @@ sd_output_t *sd_output_create(sd_resource_t *res) /* {{{ */
     return NULL;
   }
 
-  out->staged = c_avl_create((void *)strcmp);
+  out->staged = c_avl_create((int (*)(const void *, const void *))strcmp);
   if (out->staged == NULL) {
     sd_output_destroy(out);
     return NULL;
   }
 
-  out->metric_descriptors = c_avl_create((void *)strcmp);
+  out->metric_descriptors =
+      c_avl_create((int (*)(const void *, const void *))strcmp);
   if (out->metric_descriptors == NULL) {
     sd_output_destroy(out);
     return NULL;

diff --git a/src/write_prometheus.c b/src/write_prometheus.c
index fd663c4d0e6cfbd8db5b7f579d01a890fbad8ea8..430cf3b72668e8f48a55352426ded1f83bcb8263 100644 (file)
--- a/src/write_prometheus.c
+++ b/src/write_prometheus.c
@@ -732,7 +732,7 @@ static int prom_config(oconfig_item_t *ci) {
 
 static int prom_init() {
   if (prom_metrics == NULL) {
-    prom_metrics = c_avl_create((void *)strcmp);
+    prom_metrics = c_avl_create((int (*)(const void *, const void *))strcmp);
     if (prom_metrics == NULL) {
       ERROR("write_prometheus plugin: c_avl_create() failed.");
       return -1;