You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rp...@apache.org on 2008/06/11 22:00:11 UTC
svn commit: r666815 - in /apr/apr-util/branches/1.3.x: dbd/apr_dbd.c
ldap/apr_ldap_option.c ldap/apr_ldap_rebind.c
Author: rpluem
Date: Wed Jun 11 13:00:10 2008
New Revision: 666815
URL: http://svn.apache.org/viewvc?rev=666815&view=rev
Log:
Merge r663344 from trunk:
* Fix some gcc compiler warnings on Solaris with the Solaris LDAP SDK
Submitted by: rpluem
Reviewed by: rpluem
Modified:
apr/apr-util/branches/1.3.x/dbd/apr_dbd.c
apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c
apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c
Modified: apr/apr-util/branches/1.3.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/apr_dbd.c?rev=666815&r1=666814&r2=666815&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.3.x/dbd/apr_dbd.c Wed Jun 11 13:00:10 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/branches/1.3.x/ldap/apr_ldap_option.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c?rev=666815&r1=666814&r2=666815&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c (original)
+++ apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c Wed Jun 11 13:00:10 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/branches/1.3.x/ldap/apr_ldap_rebind.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c?rev=666815&r1=666814&r2=666815&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c (original)
+++ apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c Wed Jun 11 13:00:10 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