From: Eero Tamminen <eero.t.tamminen@intel.com>
Date: Fri, 19 Jan 2024 10:35:14 +0000 (+0200)
Subject: daemon/utils_cache.c: fix -Wpedantic warnings
X-Git-Tag: collectd-6.0.0.rc1~1^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95a54dd0f69c04f67a256a5be57659c2e754fc12;p=thirdparty%2Fcollectd.git

daemon/utils_cache.c: fix -Wpedantic warnings

Semicolons are nice for editor indenting, but redundant ones
are against ISO C.  This can be fixed by adding do/while(0) loop
to macro, which requires also making functions otherwise look
like normal functions.

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

diff --git a/src/daemon/utils_cache.c b/src/daemon/utils_cache.c
index 970231883..5c7a6af3c 100644
--- a/src/daemon/utils_cache.c
+++ b/src/daemon/utils_cache.c
@@ -909,7 +909,7 @@ static meta_data_t *uc_get_meta(metric_t const *m) /* {{{ */
 /* Sorry about this preprocessor magic, but it really makes this file much
  * shorter.. */
 #define UC_WRAP(wrap_function)                                                 \
-  {                                                                            \
+  do {                                                                         \
     pthread_mutex_lock(&cache_lock);                                           \
     errno = 0;                                                                 \
     meta_data_t *meta = uc_get_meta(m);                                        \
@@ -920,23 +920,23 @@ static meta_data_t *uc_get_meta(metric_t const *m) /* {{{ */
     int ret = wrap_function(meta, key);                                        \
     pthread_mutex_unlock(&cache_lock);                                         \
     return ret;                                                                \
-  }
-
-int uc_meta_data_exists(metric_t const *m, const char *key)
-    UC_WRAP(meta_data_exists);
-
-int uc_meta_data_delete(metric_t const *m, const char *key)
-    UC_WRAP(meta_data_delete);
+  } while (0)
 
+int uc_meta_data_exists(metric_t const *m, const char *key) {
+  UC_WRAP(meta_data_exists);
+}
+int uc_meta_data_delete(metric_t const *m, const char *key) {
+  UC_WRAP(meta_data_delete);
+}
 /* The second argument is called `toc` in the API, but the macro expects
  * `key`. */
-int uc_meta_data_toc(metric_t const *m, char ***key) UC_WRAP(meta_data_toc);
+int uc_meta_data_toc(metric_t const *m, char ***key) { UC_WRAP(meta_data_toc); }
 #undef UC_WRAP
 
 /* We need a new version of this macro because the following functions take
- * two argumetns. gratituous semicolons added for formatting sanity*/
+ * two arguments. Gratuitous semicolons added for formatting sanity. */
 #define UC_WRAP(wrap_function)                                                 \
-  {                                                                            \
+  do {                                                                         \
     pthread_mutex_lock(&cache_lock);                                           \
     errno = 0;                                                                 \
     meta_data_t *meta = uc_get_meta(m);                                        \
@@ -947,37 +947,41 @@ int uc_meta_data_toc(metric_t const *m, char ***key) UC_WRAP(meta_data_toc);
     int ret = wrap_function(meta, key, value);                                 \
     pthread_mutex_unlock(&cache_lock);                                         \
     return ret;                                                                \
-  }
-int uc_meta_data_add_string(metric_t const *m, const char *key,
-                            const char *value) UC_WRAP(meta_data_add_string);
+  } while (0)
 
+int uc_meta_data_add_string(metric_t const *m, const char *key,
+                            const char *value) {
+  UC_WRAP(meta_data_add_string);
+}
 int uc_meta_data_add_signed_int(metric_t const *m, const char *key,
-                                int64_t value)
-    UC_WRAP(meta_data_add_signed_int);
-
+                                int64_t value) {
+  UC_WRAP(meta_data_add_signed_int);
+}
 int uc_meta_data_add_unsigned_int(metric_t const *m, const char *key,
-                                  uint64_t value)
-    UC_WRAP(meta_data_add_unsigned_int);
-
-int uc_meta_data_add_double(metric_t const *m, const char *key, double value)
-    UC_WRAP(meta_data_add_double);
-int uc_meta_data_add_boolean(metric_t const *m, const char *key, bool value)
-    UC_WRAP(meta_data_add_boolean);
-
-int uc_meta_data_get_string(metric_t const *m, const char *key, char **value)
-    UC_WRAP(meta_data_get_string);
-
+                                  uint64_t value) {
+  UC_WRAP(meta_data_add_unsigned_int);
+}
+int uc_meta_data_add_double(metric_t const *m, const char *key, double value) {
+  UC_WRAP(meta_data_add_double);
+}
+int uc_meta_data_add_boolean(metric_t const *m, const char *key, bool value) {
+  UC_WRAP(meta_data_add_boolean);
+}
+int uc_meta_data_get_string(metric_t const *m, const char *key, char **value) {
+  UC_WRAP(meta_data_get_string);
+}
 int uc_meta_data_get_signed_int(metric_t const *m, const char *key,
-                                int64_t *value)
-    UC_WRAP(meta_data_get_signed_int);
-
+                                int64_t *value) {
+  UC_WRAP(meta_data_get_signed_int);
+}
 int uc_meta_data_get_unsigned_int(metric_t const *m, const char *key,
-                                  uint64_t *value)
-    UC_WRAP(meta_data_get_unsigned_int);
-
-int uc_meta_data_get_double(metric_t const *m, const char *key, double *value)
-    UC_WRAP(meta_data_get_double);
-
-int uc_meta_data_get_boolean(metric_t const *m, const char *key, bool *value)
-    UC_WRAP(meta_data_get_boolean);
+                                  uint64_t *value) {
+  UC_WRAP(meta_data_get_unsigned_int);
+}
+int uc_meta_data_get_double(metric_t const *m, const char *key, double *value) {
+  UC_WRAP(meta_data_get_double);
+}
+int uc_meta_data_get_boolean(metric_t const *m, const char *key, bool *value) {
+  UC_WRAP(meta_data_get_boolean);
+}
 #undef UC_WRAP