From: Florian Forster <octo@collectd.org>
Date: Sun, 24 Dec 2023 20:44:59 +0000 (+0100)
Subject: resource_metrics: Fix an incorrect pointer type.
X-Git-Tag: 6.0.0-rc0~23^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0e41b11ccba18d56bb594eced13c243efe3e2d8;p=thirdparty%2Fcollectd.git

resource_metrics: Fix an incorrect pointer type.

It's only ever used for a NULL comparison, so it doesn't really matter,
but it is unnecessarily confusing to use an incorrect type.
---

diff --git a/src/utils/resource_metrics/resource_metrics.c b/src/utils/resource_metrics/resource_metrics.c
index 8e49bcc9d..1182445a6 100644
--- a/src/utils/resource_metrics/resource_metrics.c
+++ b/src/utils/resource_metrics/resource_metrics.c
@@ -160,9 +160,8 @@ 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_family_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), (void *)compare_metrics);
   return found != NULL;
 }
 
@@ -170,7 +169,6 @@ static int insert_metrics(metric_family_t *fam, metric_list_t metrics) {
   int skipped = 0;
   for (size_t i = 0; i < metrics.num; i++) {
     metric_t const *m = metrics.ptr + i;
-
     if (metric_exists(fam, m)) {
 #if COLLECT_DEBUG
       strbuf_t buf = STRBUF_CREATE;