From 8ff2bccee31a7be12f653bc533b3e76c052534f8 Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Fri, 26 Jan 2007 17:45:42 +0000
Subject: Squelch some VC++ compiler warnings. Mark float literals with the "f"
 suffix, to distinguish them from doubles. Make some function declarations and
 definitions use the "const" qualifier for arguments consistently. Ignore
 warning 4102 ("unreferenced label"), because such warnings are always emitted
 by bison-generated code. Patch from Magnus Hagander.

---
 src/interfaces/libpq/fe-secure.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/interfaces/libpq/fe-secure.c')

diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index c27abb0c19a..a471c0b11fe 100644
--- 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.90 2007/01/05 22:20:01 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.91 2007/01/26 17:45:41 neilc Exp $
  *
  * NOTES
  *	  [ Most of these notes are wrong/obsolete, but perhaps not all ]
@@ -575,7 +575,6 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 	char		fnbuf[MAXPGPATH];
 	FILE	   *fp;
 	PGconn	   *conn = (PGconn *) SSL_get_app_data(ssl);
-	int			(*cb) () = NULL;	/* how to read user password */
 	char		sebuf[256];
 
 	if (!pqGetHomeDirectory(homedir, sizeof(homedir)))
@@ -642,7 +641,7 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 		return 0;
 	}
 #endif
-	if (PEM_read_PrivateKey(fp, pkey, cb, NULL) == NULL)
+	if (PEM_read_PrivateKey(fp, pkey, NULL, NULL) == NULL)
 	{
 		char	   *err = SSLerrmessage();
 
-- 
cgit v1.2.3