From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 30 Mar 2002 00:42:40 +0000 (+0000)
Subject: move ldap_int_put_filter to ldap_pvt_put_filter
X-Git-Tag: OPENLDAP_REL_ENG_2_MP~286
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=111b4646426a263ce278ede42a5f88e869f5d325;p=openldap

move ldap_int_put_filter to ldap_pvt_put_filter
and other cleanup
---

diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index 891cbd7697..fe0fab327b 100644
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.c
@@ -307,7 +307,7 @@ put_complex_filter( BerElement *ber, char *str, ber_tag_t tag, int not )
 }
 
 int
-ldap_int_put_filter( BerElement *ber, const char *str_in )
+ldap_pvt_put_filter( BerElement *ber, const char *str_in )
 {
 	int rc;
 	char	*freeme;
@@ -349,7 +349,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
 	 */
 
 #ifdef NEW_LOGGING
-	LDAP_LOG (( "filter", LDAP_LEVEL_ARGS, "ldap_int_put_filter: \"%s\"\n",
+	LDAP_LOG (( "filter", LDAP_LEVEL_ARGS, "ldap_pvt_put_filter: \"%s\"\n",
 		str_in ));
 #else
 	Debug( LDAP_DEBUG_TRACE, "put_filter: \"%s\"\n", str_in, 0, 0 );
@@ -373,7 +373,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
 			case '&':
 #ifdef NEW_LOGGING
 				LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-					"ldap_int_put_filter: AND\n" ));
+					"ldap_pvt_put_filter: AND\n" ));
 #else
 				Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n",
 				    0, 0, 0 );
@@ -392,7 +392,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
 			case '|':
 #ifdef NEW_LOGGING
 				LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-					"ldap_int_put_filter: OR\n" ));
+					"ldap_pvt_put_filter: OR\n" ));
 #else
 				Debug( LDAP_DEBUG_TRACE, "put_filter: OR\n",
 				    0, 0, 0 );
@@ -411,7 +411,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
 			case '!':
 #ifdef NEW_LOGGING
 				LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-					"ldap_int_put_filter: NOT\n" ));
+					"ldap_pvt_put_filter: NOT\n" ));
 #else
 				Debug( LDAP_DEBUG_TRACE, "put_filter: NOT\n",
 				    0, 0, 0 );
@@ -430,7 +430,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
 			default:
 #ifdef NEW_LOGGING
 				LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-					"ldap_int_put_filter: simple\n" ));
+					"ldap_pvt_put_filter: simple\n" ));
 #else
 				Debug( LDAP_DEBUG_TRACE, "put_filter: simple\n",
 				    0, 0, 0 );
@@ -481,7 +481,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
 		case /*'('*/ ')':
 #ifdef NEW_LOGGING
 			LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-				"ldap_int_put_filter: end\n" ));
+				"ldap_pvt_put_filter: end\n" ));
 #else
 			Debug( LDAP_DEBUG_TRACE, "put_filter: end\n",
 				0, 0, 0 );
@@ -501,7 +501,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
 		default:	/* assume it's a simple type=value filter */
 #ifdef NEW_LOGGING
 			LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-				"ldap_int_put_filter: default\n" ));
+				"ldap_pvt_put_filter: default\n" ));
 #else
 			Debug( LDAP_DEBUG_TRACE, "put_filter: default\n",
 				0, 0, 0 );
@@ -554,7 +554,7 @@ put_filter_list( BerElement *ber, char *str, ber_tag_t tag )
 
 		/* now we have "(filter)" with str pointing to it */
 		*next = '\0';
-		if ( ldap_int_put_filter( ber, str ) == -1 ) return -1;
+		if ( ldap_pvt_put_filter( ber, str ) == -1 ) return -1;
 		*next = save;
 		str = next;
 
diff --git a/libraries/libldap/ftest.c b/libraries/libldap/ftest.c
index 8fda498e38..587c0638bf 100644
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.c
@@ -15,7 +15,7 @@
 
 #include <ldap.h>
 
-#include "ldap-int.h"
+#include "ldap_pvt.h"
 
 #include "ldif.h"
 #include "lutil.h"
@@ -88,7 +88,7 @@ static int filter2ber( char *filter )
 		return EXIT_FAILURE;
 	}
 
-	rc = ldap_int_put_filter( ber, filter );
+	rc = ldap_pvt_put_filter( ber, filter );
 	if( rc < 0 ) {
 		fprintf( stderr, "Filter error!\n");
 		return EXIT_FAILURE;
diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 2b9df3da60..baeebd6926 100644
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -488,9 +488,6 @@ LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
 	ber_int_t timelimit,
 	ber_int_t sizelimit ));
 
-LDAP_F( int ) ldap_int_put_filter LDAP_P((
-	BerElement *ber,
-	const char *str ));
 
 /*
  * in unbind.c
diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index c8e276a663..75eae1cb92 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -295,7 +295,7 @@ ldap_build_search_req(
 		filter = "(objectclass=*)";
 	}
 
-	err = ldap_int_put_filter( ber, filter );
+	err = ldap_pvt_put_filter( ber, filter );
 
 	if ( err  == -1 ) {
 		ld->ld_errno = LDAP_FILTER_ERROR;
diff --git a/servers/slapd/back-bdb/backbdb.dsp b/servers/slapd/back-bdb/backbdb.dsp
index c2e5afabe6..9c46563369 100644
--- a/servers/slapd/back-bdb/backbdb.dsp
+++ b/servers/slapd/back-bdb/backbdb.dsp
@@ -231,6 +231,10 @@ SOURCE=.\nextid.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\operational.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\passwd.c
 # End Source File
 # Begin Source File
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 1242a6091f..16124c0c31 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -330,7 +330,6 @@ get_substring_filter(
 	ber_len_t	len;
 	ber_tag_t	rc;
 	struct berval value;
-	struct berval escaped;
 	char		*last;
 	struct berval bv;
 	*text = "error decoding filter";
diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 3392aefbc4..45a42ad600 100644
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -48,7 +48,7 @@ str2filter( const char *str )
 		return NULL;
 	}
 
-	rc = ldap_int_put_filter( ber, str );
+	rc = ldap_pvt_put_filter( ber, str );
 	if( rc < 0 ) {
 		goto done;
 	}