postgres.git / summary / log / commit / refs

commit    7f814400a8039c55d5691023bbbe8739798b123d
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Apr 17 20:12:24 2014 +0000
First released in: 9.4.0, 8.4.22, 9.0.18, 9.1.14, 9.2.9, 9.3.5

    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


 src/interfaces/libpq/fe-connect.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index ec183b42ee5..261cb3066ff 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -3365,11 +3365,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,
@@ -3514,11 +3516,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.
 	 */
@@ -3531,7 +3535,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)
 	{
@@ -3786,7 +3790,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
 
 	return 0;
 }
-#endif
+
+#endif	/* USE_LDAP */
 
 #define MAXBUFSIZE 256
 


[parent: fc02b87e2876]