mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-07 19:47:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix unused-variable warning on Windows.

Browse Source 
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
This commit is contained in:
Tom Lane 2014-04-17 16:12:24 -04:00
parent a1b9c46300
commit 757ade42d0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/interfaces/libpq/fe-connect.c
View File

@ -3134,11 +3134,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,
@ -3283,11 +3285,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.
*/
@ -3300,7 +3304,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)
{
@ -3555,7 +3559,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
return 0;
}
#endif
#endif /* USE_LDAP */
#define MAXBUFSIZE 256