From 71bcd4a4b63e85c2640b950769f1682b10e4f5fa Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 28 Oct 2006 18:13:12 +0000 Subject: [PATCH] s/ldap_int_discard/ldap_pvt_discard/ --- include/ldap_pvt.h | 9 +++++++-- libraries/libldap/abandon.c | 4 ++-- libraries/libldap/ldap-int.h | 5 ----- servers/slapd/back-ldap/bind.c | 2 +- servers/slapd/back-meta/bind.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h index 8048e6192f..7d9561d9bb 100644 --- a/include/ldap_pvt.h +++ b/include/ldap_pvt.h @@ -224,14 +224,19 @@ LDAP_F (void) ldap_pvt_sasl_remove LDAP_P(( struct sockbuf * )); struct ldap; struct ldapmsg; -LDAP_F (int) ldap_open_internal_connection LDAP_P(( - struct ldap **ldp, ber_socket_t *fdp )); +/* abandon */ +LDAP_F ( int ) ldap_pvt_discard LDAP_P(( + struct ldap *ld, ber_int_t msgid )); /* messages.c */ LDAP_F( BerElement * ) ldap_get_message_ber LDAP_P(( struct ldapmsg * )); +/* open */ +LDAP_F (int) ldap_open_internal_connection LDAP_P(( + struct ldap **ldp, ber_socket_t *fdp )); + /* search.c */ LDAP_F( int ) ldap_pvt_put_filter LDAP_P(( BerElement *ber, diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c index d340286cb1..ac9245a9bd 100644 --- a/libraries/libldap/abandon.c +++ b/libraries/libldap/abandon.c @@ -108,7 +108,7 @@ ldap_abandon( LDAP *ld, int msgid ) int -ldap_int_discard( +ldap_pvt_discard( LDAP *ld, ber_int_t msgid ) { @@ -141,7 +141,7 @@ do_abandon( Sockbuf *sb; LDAPRequest *lr; - Debug( LDAP_DEBUG_TRACE, "ldap_int_discard origid %d, msgid %d\n", + Debug( LDAP_DEBUG_TRACE, "ldap_pvt_discard origid %d, msgid %d\n", origid, msgid, 0 ); /* find the request that we are abandoning */ diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h index 5a1ba5e0f8..8b02d5faf8 100644 --- a/libraries/libldap/ldap-int.h +++ b/libraries/libldap/ldap-int.h @@ -397,11 +397,6 @@ LDAP_V( ldap_pvt_thread_mutex_t ) ldap_int_sasl_mutex; #define LDAP_NEXT_MSGID(ld, id) id = ++(ld)->ld_msgid #endif -LDAP_F ( int ) -ldap_int_discard LDAP_P(( - LDAP *ld, - ber_int_t msgid )); - /* * in init.c */ diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c index 959d5178d5..1c6b113679 100644 --- a/servers/slapd/back-ldap/bind.c +++ b/servers/slapd/back-ldap/bind.c @@ -1344,7 +1344,7 @@ ldap_back_cancel( } if ( LDAP_BACK_IGNORE( li ) ) { - return ldap_int_discard( lc->lc_ld, msgid ); + return ldap_pvt_discard( lc->lc_ld, msgid ); } if ( LDAP_BACK_CANCEL( li ) ) { diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c index 59c5fabd35..f96c60cadf 100644 --- a/servers/slapd/back-meta/bind.c +++ b/servers/slapd/back-meta/bind.c @@ -874,7 +874,7 @@ meta_back_cancel( rc = ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL ); } else if ( META_BACK_TGT_IGNORE( mt ) ) { - rc = ldap_int_discard( msc->msc_ld, msgid ); + rc = ldap_pvt_discard( msc->msc_ld, msgid ); } else if ( META_BACK_TGT_CANCEL( mt ) ) { rc = ldap_cancel_s( msc->msc_ld, msgid, NULL, NULL ); -- 2.39.5