Skip to content

Commit 570b726

Browse files
author
Neil Conway
committed
Minor refactoring: initialize_SSL() only returns 0, so it should return
"void" rather than "int".
1 parent c4826cf commit 570b726

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/backend/libpq/be-secure.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.62 2006/03/05 15:58:27 momjian Exp $
14+
* $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.63 2006/03/21 18:18:35 neilc Exp $
1515
*
1616
* Since the server static private key ($DataDir/server.key)
1717
* will normally be stored unencrypted so that the database
@@ -110,7 +110,7 @@ static DH *load_dh_buffer(const char *, size_t);
110110
static DH *tmp_dh_cb(SSL *s, int is_export, int keylength);
111111
static int verify_cb(int, X509_STORE_CTX *);
112112
static void info_cb(const SSL *ssl, int type, int args);
113-
static int initialize_SSL(void);
113+
static void initialize_SSL(void);
114114
static void destroy_SSL(void);
115115
static int open_server_SSL(Port *);
116116
static void close_SSL(Port *);
@@ -204,13 +204,11 @@ KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI=\n\
204204
int
205205
secure_initialize(void)
206206
{
207-
int r = 0;
208-
209207
#ifdef USE_SSL
210-
r = initialize_SSL();
208+
initialize_SSL();
211209
#endif
212210

213-
return r;
211+
return 0;
214212
}
215213

216214
/*
@@ -712,7 +710,7 @@ info_cb(const SSL *ssl, int type, int args)
712710
/*
713711
* Initialize global SSL context.
714712
*/
715-
static int
713+
static void
716714
initialize_SSL(void)
717715
{
718716
struct stat buf;
@@ -802,8 +800,6 @@ initialize_SSL(void)
802800
SSL_VERIFY_CLIENT_ONCE),
803801
verify_cb);
804802
}
805-
806-
return 0;
807803
}
808804

809805
/*

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy