postgres.git / summary / log / commit / refs

commit    3235a11c128b5979bce84d56b8044c7fb2e6b61d
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Apr 01 23:01:18 2024 +0000
First released in: 17.0, 12.19, 13.15, 14.12, 15.7, 16.3

    Avoid "unused variable" warning on non-USE_SSL_ENGINE platforms.
    
    If we are building with openssl but USE_SSL_ENGINE didn't get set,
    initialize_SSL's variable "pkey" is declared but used nowhere.
    Apparently this combination hasn't been exercised in the buildfarm
    before now, because I've not seen this warning before, even though
    the code has been like this a long time.  Move the declaration
    to silence the warning (and remove its useless initialization).
    
    Per buildfarm member sawshark.  Back-patch to all supported branches.


 src/interfaces/libpq/fe-secure-openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index c2858096b5d..a44d7d3f29e 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -915,7 +915,6 @@ initialize_SSL(PGconn *conn)
 	bool		have_homedir;
 	bool		have_cert;
 	bool		have_rootcert;
-	EVP_PKEY   *pkey = NULL;
 
 	/*
 	 * We'll need the home directory if any of the relevant parameters are
@@ -1265,6 +1264,7 @@ initialize_SSL(PGconn *conn)
 			/* Colon, but not in second character, treat as engine:key */
 			char	   *engine_str = strdup(conn->sslkey);
 			char	   *engine_colon;
+			EVP_PKEY   *pkey;
 
 			if (engine_str == NULL)
 			{


[parent: 14e4e8f8c66b]