diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-04-17 16:12:24 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-04-17 16:12:24 -0400 |
| commit | 01563158235f5650743fd9b1dfa80c3d8faf89bb (patch) | |
| tree | d9783a3691385c8b5137929d8342edd964f11d97 | |
| parent | 9fe55259fd61fd9199907623f974caa7af66e780 (diff) | |
| download | postgresql-01563158235f5650743fd9b1dfa80c3d8faf89bb.tar.gz postgresql-01563158235f5650743fd9b1dfa80c3d8faf89bb.zip | |
Fix unused-variable warning on Windows.
Introduced in 585bca39: msgid is not used in the Windows code path.
Also adjust comments a tad (mostly to keep pgindent from messing it up).
David Rowley
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 10cc0e69b20..3909367be6f 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -3362,11 +3362,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options, int port = LDAP_DEF_PORT, scope, rc, - msgid, size, state, oldstate, i; +#ifndef WIN32 + int msgid; +#endif bool found_keyword; char *url, *hostname, @@ -3511,11 +3513,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options, /* * Perform an explicit anonymous bind. - * LDAP does not require that an anonymous bind is preformed explicitly, + * + * LDAP does not require that an anonymous bind is performed explicitly, * but we want to distinguish between the case where LDAP bind does not * succeed within PGLDAP_TIMEOUT seconds (return 2 to continue parsing * the service control file) and the case where querying the LDAP server * fails (return 1 to end parsing). + * * Unfortunately there is no way of setting a timeout that works for * both Windows and OpenLDAP. */ @@ -3528,7 +3532,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options, ldap_unbind(ld); return 2; } -#else /* WIN32 */ +#else /* !WIN32 */ /* in OpenLDAP, use the LDAP_OPT_NETWORK_TIMEOUT option */ if (ldap_set_option(ld, LDAP_OPT_NETWORK_TIMEOUT, &time) != LDAP_SUCCESS) { @@ -3783,7 +3787,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options, return 0; } -#endif + +#endif /* USE_LDAP */ #define MAXBUFSIZE 256 |