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.

diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index bd4daeb74261fee2200f1bbbb0ac9a25ff08ce45..e96dcec9d5a209e30a3a4474ddd2cd7233d24d5b 100644 (file)
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -781,7 +781,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
@@ -1117,6 +1116,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)
            {