From: Eero Tamminen <eero.t.tamminen@intel.com>
Date: Fri, 19 Jan 2024 16:31:54 +0000 (+0200)
Subject: resource_metrics.c: fix -Wpedantic warnings for casts, option 1
X-Git-Tag: collectd-6.0.0.rc1~1^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=359058389756e9e46707b4f9ead3147f80bb5c1f;p=thirdparty%2Fcollectd.git

resource_metrics.c: fix -Wpedantic warnings for casts, option 1

By casting function types to ones expected by bsearch() & qsort().

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

diff --git a/src/utils/resource_metrics/resource_metrics.c b/src/utils/resource_metrics/resource_metrics.c
index 1182445a6..371dc6c10 100644
--- a/src/utils/resource_metrics/resource_metrics.c
+++ b/src/utils/resource_metrics/resource_metrics.c
@@ -28,6 +28,8 @@
 #include "utils/common/common.h"
 #include "utils/resource_metrics/resource_metrics.h"
 
+typedef int (*compare_fn_t)(const void *, const void *);
+
 static int resource_metrics_compare(resource_metrics_t const *a,
                                     resource_metrics_t const *b) {
   return label_set_compare(a->resource, b->resource);
@@ -40,7 +42,7 @@ static resource_metrics_t *lookup_resource(resource_metrics_set_t *set,
   };
 
   return bsearch(&key, set->ptr, set->num, sizeof(*set->ptr),
-                 (void *)resource_metrics_compare);
+                 (compare_fn_t)resource_metrics_compare);
 }
 
 static int insert_resource(resource_metrics_set_t *set, label_set_t resource) {
@@ -61,7 +63,7 @@ static int insert_resource(resource_metrics_set_t *set, label_set_t resource) {
   set->num++;
 
   qsort(set->ptr, set->num, sizeof(*set->ptr),
-        (void *)resource_metrics_compare);
+        (compare_fn_t)resource_metrics_compare);
   return 0;
 }
 
@@ -91,7 +93,7 @@ static metric_family_t *lookup_family(resource_metrics_t *rm,
                                       metric_family_t const *fam) {
   metric_family_t **ret =
       bsearch(&fam, rm->families, rm->families_num, sizeof(*rm->families),
-              (void *)compare_family_by_name);
+              (compare_fn_t)compare_family_by_name);
   if (ret == NULL) {
     return NULL;
   }
@@ -122,7 +124,7 @@ static int insert_family(resource_metrics_t *rm, metric_family_t const *fam) {
   rm->families_num++;
 
   qsort(rm->families, rm->families_num, sizeof(*rm->families),
-        (void *)compare_family_by_name);
+        (compare_fn_t)compare_family_by_name);
   return 0;
 }
 
@@ -160,8 +162,9 @@ static int compare_metrics(metric_t const *a, metric_t const *b) {
 }
 
 static bool metric_exists(metric_family_t const *fam, metric_t const *m) {
-  metric_t *found = bsearch(m, fam->metric.ptr, fam->metric.num,
-                            sizeof(*fam->metric.ptr), (void *)compare_metrics);
+  metric_t *found =
+      bsearch(m, fam->metric.ptr, fam->metric.num, sizeof(*fam->metric.ptr),
+              (compare_fn_t)compare_metrics);
   return found != NULL;
 }
 
@@ -191,7 +194,7 @@ static int insert_metrics(metric_family_t *fam, metric_list_t metrics) {
 
   if (((size_t)skipped) != metrics.num) {
     qsort(fam->metric.ptr, fam->metric.num, sizeof(*fam->metric.ptr),
-          (void *)compare_metrics);
+          (compare_fn_t)compare_metrics);
   }
 
   return skipped;