svn commit: r125607 - /apr/apr-util/trunk/test/testldap.c

[jo...@apache.org]

Author: jorton
Date: Wed Jan 19 02:39:03 2005
New Revision: 125607

URL: http://svn.apache.org/viewcvs?view=rev&rev=125607
Log:
* test/testldap.c: Fix non-LDAP build, and also:
(get_ldap_host): Fix prototype.
(test_ldap_mutual): Remove unused function.
(testldap): Code style fix.

Modified:
   apr/apr-util/trunk/test/testldap.c

Modified: apr/apr-util/trunk/test/testldap.c
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/test/testldap.c?view=diff&rev=125607&p1=apr/apr-util/trunk/test/testldap.c&r1=125606&p2=apr/apr-util/trunk/test/testldap.c&r2=125607
==============================================================================
--- apr/apr-util/trunk/test/testldap.c	(original)
+++ apr/apr-util/trunk/test/testldap.c	Wed Jan 19 02:39:03 2005
@@ -67,9 +67,11 @@
 #define CERTFILEDER DIRNAME "/*.der"
 #define CERTFILEB64 DIRNAME "/*.b64"
 
+#if APR_HAS_LDAP
+
 static char ldap_host[256];
 
-static int get_ldap_host()
+static int get_ldap_host(void)
 {
     apr_status_t rv;
     apr_file_t *thefile = NULL;
@@ -225,21 +227,22 @@
     }
 }
 
-static void test_ldap_mutual(abts_case *tc, void *data)
-{
-}
+#endif /* APR_HAS_LDAP */
 
 abts_suite *testldap(abts_suite *suite)
 {
+#if APR_HAS_LDAP
     apr_ldap_err_t *result = NULL;
     suite = ADD_SUITE(suite);
 
-    apr_ldap_ssl_init(p, NULL, 0,&(result));
+    apr_ldap_ssl_init(p, NULL, 0, &result);
+
     if (get_ldap_host()) {
         abts_run_test(suite, test_ldap, NULL);
         abts_run_test(suite, test_ldaps, NULL);
         abts_run_test(suite, test_ldap_tls, NULL);
     }
+#endif /* APR_HAS_LDAP */
 
     return suite;
 }