upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-27 20:25:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add "UNUSED(fctx);" to FCTXTRACE*() macro stubs

Browse source 
Commit 21ae6bb1b2 removed most uses of the
'fctx' variable from the rctx_dispfail() function: it is now only needed
by the FCTXTRACE3() macro.  However, when --enable-querytrace is not in
effect, that macro evaluates to a list of UNUSED() macros that does not
include "UNUSED(fctx);".  This triggers the following compilation
warning when building without --enable-querytrace:

    resolver.c: In function 'rctx_dispfail':
    resolver.c:7888:21: warning: unused variable 'fctx' [-Wunused-variable]
     7888 |         fetchctx_t *fctx = rctx->fctx;
          |                     ^~~~

Fix by adding "UNUSED(fctx);" lines to all FCTXTRACE*() macros.  This is
safe to do because all of those macros use the 'fctx' local variable, so
there is no danger of introducing new errors caused by use of undeclared
identifiers.

(cherry picked from commit b645e28167)
This commit is contained in:
Michał Kępień 2022-02-21 10:50:38 +01:00
parent 92fc6c2221
commit 08b2c1be44
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/dns/resolver.c
View file

@ -121,28 +121,33 @@
UNUSED(r); \
UNUSED(m); \
} while (0)
#define FCTXTRACE(m) \
do { \
UNUSED(m); \
#define FCTXTRACE(m) \
do { \
UNUSED(fctx); \
UNUSED(m); \
} while (0)
#define FCTXTRACE2(m1, m2) \
do { \
UNUSED(m1); \
UNUSED(m2); \
#define FCTXTRACE2(m1, m2) \
do { \
UNUSED(fctx); \
UNUSED(m1); \
UNUSED(m2); \
} while (0)
#define FCTXTRACE3(m1, res) \
do { \
UNUSED(m1); \
UNUSED(res); \
#define FCTXTRACE3(m1, res) \
do { \
UNUSED(fctx); \
UNUSED(m1); \
UNUSED(res); \
} while (0)
#define FCTXTRACE4(m1, m2, res) \
do { \
UNUSED(fctx); \
UNUSED(m1); \
UNUSED(m2); \
UNUSED(res); \
} while (0)
#define FCTXTRACE5(m1, m2, v) \
do { \
UNUSED(fctx); \
UNUSED(m1); \
UNUSED(m2); \
UNUSED(v); \
@ -9553,9 +9558,7 @@ rctx_resend(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo) {
*/
static isc_result_t
rctx_next(respctx_t *rctx) {
#ifdef WANT_QUERYTRACE
fetchctx_t *fctx = rctx->fctx;
#endif /* ifdef WANT_QUERYTRACE */
isc_result_t result;
FCTXTRACE("nextitem");