diff options
| author | Neil Conway <neilc@samurai.com> | 2007-01-26 17:45:42 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2007-01-26 17:45:42 +0000 |
| commit | 8ff2bccee31a7be12f653bc533b3e76c052534f8 (patch) | |
| tree | f56dcf47c08037f04974372492ce5a660d303472 /src/interfaces | |
| parent | 8924c568202122075ae666e8815bc2960496754c (diff) | |
| download | postgresql-8ff2bccee31a7be12f653bc533b3e76c052534f8.tar.gz postgresql-8ff2bccee31a7be12f653bc533b3e76c052534f8.zip | |
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.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/fe-secure.c | 5 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 7 |
2 files changed, 3 insertions, 9 deletions
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(); diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 9fce1e39276..61e36bfba33 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.117 2007/01/05 22:20:01 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.118 2007/01/26 17:45:41 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -38,11 +38,6 @@ #include <signal.h> #endif -#ifdef WIN32_ONLY_COMPILER -typedef int ssize_t; /* ssize_t doesn't exist in VC (at least not - * VC6) */ -#endif - /* include stuff common to fe and be */ #include "getaddrinfo.h" #include "libpq/pqcomm.h" |