apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r663344 - in /apr/apr-util/trunk: dbd/apr_dbd.c ldap/apr_ldap_option.c ldap/apr_ldap_rebind.c
Date Wed, 04 Jun 2008 19:03:18 GMT
Author: rpluem
Date: Wed Jun  4 12:03:17 2008
New Revision: 663344

URL: http://svn.apache.org/viewvc?rev=663344&view=rev
Log:
* Fix some gcc compiler warnings on Solaris with the Solaris LDAP SDK

Modified:
    apr/apr-util/trunk/dbd/apr_dbd.c
    apr/apr-util/trunk/ldap/apr_ldap_option.c
    apr/apr-util/trunk/ldap/apr_ldap_rebind.c

Modified: apr/apr-util/trunk/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd.c?rev=663344&r1=663343&r2=663344&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd.c Wed Jun  4 12:03:17 2008
@@ -25,6 +25,7 @@
 #include "apr_strings.h"
 #include "apr_hash.h"
 #include "apr_thread_mutex.h"
+#include "apr_lib.h"
 
 #include "apu_internal.h"
 #include "apr_dbd_internal.h"
@@ -369,7 +370,7 @@
     /* find the number of parameters in the query */
     for (q = query; *q; q++) {
         if (q[0] == '%') {
-            if (isalpha(q[1])) {
+            if (apr_isalpha(q[1])) {
                 nargs++;
             } else if (q[1] == '%') {
                 q++;
@@ -385,7 +386,7 @@
 
     for (p = pq, q = query, i = 0; *q; q++) {
         if (q[0] == '%') {
-            if (isalpha(q[1])) {
+            if (apr_isalpha(q[1])) {
                 switch (q[1]) {
                 case 'd': t[i] = APR_DBD_TYPE_INT;   break;
                 case 'u': t[i] = APR_DBD_TYPE_UINT;  break;

Modified: apr/apr-util/trunk/ldap/apr_ldap_option.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_option.c?rev=663344&r1=663343&r2=663344&view=diff
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_option.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_option.c Wed Jun  4 12:03:17 2008
@@ -397,9 +397,11 @@
                            const void *invalue, apr_ldap_err_t *result)
 {
 #if APR_HAS_LDAP_SSL
+#if APR_HAS_LDAPSSL_CLIENT_INIT || APR_HAS_OPENLDAP_LDAPSDK
     apr_array_header_t *certs = (apr_array_header_t *)invalue;
     struct apr_ldap_opt_tls_cert_t *ents = (struct apr_ldap_opt_tls_cert_t *)certs->elts;
     int i = 0;
+#endif
 
     /* Netscape/Mozilla/Solaris SDK */
 #if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || APR_HAS_MOZILLA_LDAPSDK

Modified: apr/apr-util/trunk/ldap/apr_ldap_rebind.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_rebind.c?rev=663344&r1=663343&r2=663344&view=diff
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_rebind.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_rebind.c Wed Jun  4 12:03:17 2008
@@ -182,7 +182,7 @@
     return APR_SUCCESS;
 }
 
-
+#if APR_HAS_TIVOLI_LDAPSDK || APR_HAS_OPENLDAP_LDAPSDK || APR_HAS_NOVELL_LDAPSDK
 static apr_ldap_rebind_entry_t *apr_ldap_rebind_lookup(LDAP *ld)
 {
     apr_ldap_rebind_entry_t *tmp_xref, *match = NULL;
@@ -212,6 +212,7 @@
 
     return (match);
 }
+#endif
 
 #if APR_HAS_TIVOLI_LDAPSDK
 



Mime
View raw message