From: Willy Tarreau <w@1wt.eu>
Date: Fri, 1 May 2020 09:38:39 +0000 (+0200)
Subject: CLEANUP: ssl: silence a build warning when threads are disabled
X-Git-Tag: v2.2-dev7~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6cd078f756838b819b199950dcb4a2a27a9761d;p=thirdparty%2Fhaproxy.git

CLEANUP: ssl: silence a build warning when threads are disabled

Building without threads now shows this warning:

src/ssl_sock.c: In function 'cli_io_handler_commit_cert':
src/ssl_sock.c:12121:24: warning: unused variable 'bind_conf' [-Wunused-variable]
      struct bind_conf *bind_conf = ckchi->bind_conf;
                        ^~~~~~~~~

This is because the variable is needed only to unlock the structure, and
the unlock operation does nothing in this case. Let's mark the variable
__maybe_unused for this, but it would be convenient in the long term if
we could make the thread macros pretend they consume the argument so that
this remains less visible outside.

No backport is needed.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 967b425cf5..6462c3e592 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -12118,7 +12118,7 @@ static int cli_io_handler_commit_cert(struct appctx *appctx)
 
 				/* delete the old sni_ctx, the old ckch_insts and the ckch_store */
 				list_for_each_entry_safe(ckchi, ckchis, &old_ckchs->ckch_inst, by_ckchs) {
-					struct bind_conf *bind_conf = ckchi->bind_conf;
+					struct bind_conf __maybe_unused *bind_conf = ckchi->bind_conf;
 
 					HA_RWLOCK_WRLOCK(SNI_LOCK, &bind_conf->sni_lock);
 					ckch_inst_free(ckchi);