From: Aydın Mercan <aydin@isc.org>
Date: Fri, 17 May 2024 13:45:10 +0000 (+0300)
Subject: fix typing mistakes in trace macros
X-Git-Tag: v9.20.0~28^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e62ee1861b4f7fdf1be4ed50c7b0bef9d629f0;p=thirdparty%2Fbind9.git

fix typing mistakes in trace macros

The detach function declaration in `ISC__REFCOUNT_TRACE_DECL` had an
returned an accidental implicit int. While not allowed since C99, it
became an error by default in GCC 14.

`ISC_REFCOUNT_TRACE_IMPL` and `ISC_REFCOUNT_STATIC_TRACE_IMPL` expanded
into the wrong macros, trying to declare it again with the wrong number
of parameters.
---

diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h
index ad361288b48..090dc7ec2a7 100644
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -127,7 +127,7 @@ typedef atomic_uint_fast32_t isc_refcount_t;
 	stat void      name##__attach(name##_t *ptr, name##_t **ptrp,      \
 				      const char *func, const char *file,  \
 				      unsigned int line);                  \
-	stat	       name##__detach(name##_t **ptrp, const char *func,   \
+	stat void      name##__detach(name##_t **ptrp, const char *func,   \
 				      const char *file, unsigned int line)
 
 #define ISC_REFCOUNT_BLANK
@@ -190,9 +190,9 @@ typedef atomic_uint_fast32_t isc_refcount_t;
 	}
 
 #define ISC_REFCOUNT_TRACE_IMPL(name, destroy) \
-	ISC__REFCOUNT_TRACE_DECL(name, destroy, ISC_REFCOUNT_BLANK)
+	ISC__REFCOUNT_TRACE_IMPL(name, destroy, ISC_REFCOUNT_BLANK)
 #define ISC_REFCOUNT_STATIC_TRACE_IMPL(name, destroy) \
-	ISC__REFCOUNT_TRACE_DECL(name, destroy, static inline)
+	ISC__REFCOUNT_TRACE_IMPL(name, destroy, static inline)
 
 #define ISC__REFCOUNT_DECL(name, stat)                                      \
 	stat name##_t *name##_ref(name##_t *ptr) __attribute__((unused));   \