Clarify variable naming: pq_initssllib -> pq_init_ssl_lib

bmomjian · bmomjian · commit b86a71c8f40d · 2009-03-28T18:48:55.000Z
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.120 2009/03/28 01:36:11 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.121 2009/03/28 18:48:55 momjian Exp $
  *
  * NOTES
  *
@@ -98,7 +98,7 @@ static void close_SSL(PGconn *);
 static char *SSLerrmessage(void);
 static void SSLerrfree(char *buf);
 
-static bool pq_initssllib = true;
+static bool pq_init_ssl_lib = true;
 static SSL_CTX *SSL_context = NULL;
 
 #ifdef ENABLE_THREAD_SAFETY
@@ -173,7 +173,7 @@ void
 PQinitSSL(int do_init)
 {
 #ifdef USE_SSL
-	pq_initssllib = do_init;
+	pq_init_ssl_lib = do_init;
 #endif
 }
 
@@ -840,7 +840,7 @@ init_ssl_system(PGconn *conn)
 	if (pthread_mutex_lock(&ssl_config_mutex))
 		return -1;
 
-	if (pq_initssllib)
+	if (pq_init_ssl_lib)
 	{
 		/*
 		 * If necessary, set up an array to hold locks for OpenSSL. OpenSSL will
@@ -880,7 +880,7 @@ init_ssl_system(PGconn *conn)
 
 	if (!SSL_context)
 	{
-		if (pq_initssllib)
+		if (pq_init_ssl_lib)
 		{
 #if SSLEAY_VERSION_NUMBER >= 0x00907000L
 			OPENSSL_config(NULL);
@@ -928,7 +928,7 @@ destroy_ssl_system(void)
 	if (pthread_mutex_lock(&ssl_config_mutex))
 		return;
 
-	if (pq_initssllib)
+	if (pq_init_ssl_lib)
 	{
 		if (ssl_open_connections > 0)
 			--ssl_open_connections;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.120 2009/03/28 01:36:11 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.121 2009/03/28 18:48:55 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`*`
`@@ -98,7 +98,7 @@ static void close_SSL(PGconn *);`
`98`	`98`	`static char *SSLerrmessage(void);`
`99`	`99`	`static void SSLerrfree(char *buf);`
`100`	`100`
`101`		`-static bool pq_initssllib = true;`
	`101`	`+static bool pq_init_ssl_lib = true;`
`102`	`102`	`static SSL_CTX *SSL_context = NULL;`
`103`	`103`
`104`	`104`	`#ifdef ENABLE_THREAD_SAFETY`
`@@ -173,7 +173,7 @@ void`
`173`	`173`	`PQinitSSL(int do_init)`
`174`	`174`	`{`
`175`	`175`	`#ifdef USE_SSL`
`176`		`- pq_initssllib = do_init;`
	`176`	`+ pq_init_ssl_lib = do_init;`
`177`	`177`	`#endif`
`178`	`178`	`}`
`179`	`179`
`@@ -840,7 +840,7 @@ init_ssl_system(PGconn *conn)`
`840`	`840`	`if (pthread_mutex_lock(&ssl_config_mutex))`
`841`	`841`	`return -1;`
`842`	`842`
`843`		`- if (pq_initssllib)`
	`843`	`+ if (pq_init_ssl_lib)`
`844`	`844`	`{`
`845`	`845`	`/*`
`846`	`846`	`* If necessary, set up an array to hold locks for OpenSSL. OpenSSL will`
`@@ -880,7 +880,7 @@ init_ssl_system(PGconn *conn)`
`880`	`880`
`881`	`881`	`if (!SSL_context)`
`882`	`882`	`{`
`883`		`- if (pq_initssllib)`
	`883`	`+ if (pq_init_ssl_lib)`
`884`	`884`	`{`
`885`	`885`	`#if SSLEAY_VERSION_NUMBER >= 0x00907000L`
`886`	`886`	`OPENSSL_config(NULL);`
`@@ -928,7 +928,7 @@ destroy_ssl_system(void)`
`928`	`928`	`if (pthread_mutex_lock(&ssl_config_mutex))`
`929`	`929`	`return;`
`930`	`930`
`931`		`- if (pq_initssllib)`
	`931`	`+ if (pq_init_ssl_lib)`
`932`	`932`	`{`
`933`	`933`	`if (ssl_open_connections > 0)`
`934`	`934`	`--ssl_open_connections;`