(cloudberry) 02/05: Avoid "unused variable" warning on non-USE_SSL_ENGINE platforms.

[le...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

leborchuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit 46635b5fbf298ecf34abd81d0aeb9bb1fd975a7e
Author: Tom Lane <tg...@sss.pgh.pa.us>
AuthorDate: Mon Apr 1 19:01:18 2024 -0400

    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 5c6b317caa7..ccd886abb84 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -797,7 +797,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
@@ -1133,6 +1132,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)
 			{


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org