mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

move ldap_int_put_filter to ldap_pvt_put_filter

Browse Source 
and other cleanup
This commit is contained in:
Kurt Zeilenga 2002-03-30 00:42:40 +00:00
parent 7250ffb1cc
commit 111b464642
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/libldap/filter.c
View File

@ -307,7 +307,7 @@ put_complex_filter( BerElement *ber, char *str, ber_tag_t tag, int not )
} }
int int
ldap_int_put_filter( BerElement *ber, const char *str_in ) ldap_pvt_put_filter( BerElement *ber, const char *str_in )
{ {
int rc; int rc;
char *freeme; char *freeme;
@ -349,7 +349,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
*/ */
#ifdef NEW_LOGGING #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 )); str_in ));
#else #else
Debug( LDAP_DEBUG_TRACE, "put_filter: \"%s\"\n", str_in, 0, 0 ); 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 '&': case '&':
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_int_put_filter: AND\n" )); "ldap_pvt_put_filter: AND\n" ));
#else #else
Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n", Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n",
0, 0, 0 ); 0, 0, 0 );
@ -392,7 +392,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
case '|': case '|':
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_int_put_filter: OR\n" )); "ldap_pvt_put_filter: OR\n" ));
#else #else
Debug( LDAP_DEBUG_TRACE, "put_filter: OR\n", Debug( LDAP_DEBUG_TRACE, "put_filter: OR\n",
0, 0, 0 ); 0, 0, 0 );
@ -411,7 +411,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
case '!': case '!':
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_int_put_filter: NOT\n" )); "ldap_pvt_put_filter: NOT\n" ));
#else #else
Debug( LDAP_DEBUG_TRACE, "put_filter: NOT\n", Debug( LDAP_DEBUG_TRACE, "put_filter: NOT\n",
0, 0, 0 ); 0, 0, 0 );
@ -430,7 +430,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
default: default:
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_int_put_filter: simple\n" )); "ldap_pvt_put_filter: simple\n" ));
#else #else
Debug( LDAP_DEBUG_TRACE, "put_filter: simple\n", Debug( LDAP_DEBUG_TRACE, "put_filter: simple\n",
0, 0, 0 ); 0, 0, 0 );
@ -481,7 +481,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
case /*'('*/ ')': case /*'('*/ ')':
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_int_put_filter: end\n" )); "ldap_pvt_put_filter: end\n" ));
#else #else
Debug( LDAP_DEBUG_TRACE, "put_filter: end\n", Debug( LDAP_DEBUG_TRACE, "put_filter: end\n",
0, 0, 0 ); 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 */ default: /* assume it's a simple type=value filter */
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1,
"ldap_int_put_filter: default\n" )); "ldap_pvt_put_filter: default\n" ));
#else #else
Debug( LDAP_DEBUG_TRACE, "put_filter: default\n", Debug( LDAP_DEBUG_TRACE, "put_filter: default\n",
0, 0, 0 ); 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 */ /* now we have "(filter)" with str pointing to it */
*next = '\0'; *next = '\0';
if ( ldap_int_put_filter( ber, str ) == -1 ) return -1; if ( ldap_pvt_put_filter( ber, str ) == -1 ) return -1;
*next = save; *next = save;
str = next; str = next;

4
libraries/libldap/ftest.c
View File

@ -15,7 +15,7 @@
#include <ldap.h> #include <ldap.h>
#include "ldap-int.h" #include "ldap_pvt.h"
#include "ldif.h" #include "ldif.h"
#include "lutil.h" #include "lutil.h"
@ -88,7 +88,7 @@ static int filter2ber( char *filter )
return EXIT_FAILURE; return EXIT_FAILURE;
} }
rc = ldap_int_put_filter( ber, filter ); rc = ldap_pvt_put_filter( ber, filter );
if( rc < 0 ) { if( rc < 0 ) {
fprintf( stderr, "Filter error!\n"); fprintf( stderr, "Filter error!\n");
return EXIT_FAILURE; return EXIT_FAILURE;

3
libraries/libldap/ldap-int.h
View File

@ -488,9 +488,6 @@ LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
ber_int_t timelimit, ber_int_t timelimit,
ber_int_t sizelimit )); ber_int_t sizelimit ));
LDAP_F( int ) ldap_int_put_filter LDAP_P((
BerElement *ber,
const char *str ));
/* /*
* in unbind.c * in unbind.c

2
libraries/libldap/search.c
View File

@ -295,7 +295,7 @@ ldap_build_search_req(
filter = "(objectclass=*)"; filter = "(objectclass=*)";
} }
err = ldap_int_put_filter( ber, filter ); err = ldap_pvt_put_filter( ber, filter );
if ( err == -1 ) { if ( err == -1 ) {
ld->ld_errno = LDAP_FILTER_ERROR; ld->ld_errno = LDAP_FILTER_ERROR;

4
servers/slapd/back-bdb/backbdb.dsp
View File

@ -231,6 +231,10 @@ SOURCE=.\nextid.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\operational.c
# End Source File
# Begin Source File
SOURCE=.\passwd.c SOURCE=.\passwd.c
# End Source File # End Source File
# Begin Source File # Begin Source File

1
servers/slapd/filter.c
View File

@ -330,7 +330,6 @@ get_substring_filter(
ber_len_t len; ber_len_t len;
ber_tag_t rc; ber_tag_t rc;
struct berval value; struct berval value;
struct berval escaped;
char *last; char *last;
struct berval bv; struct berval bv;
*text = "error decoding filter"; *text = "error decoding filter";

2
servers/slapd/str2filter.c
View File

@ -48,7 +48,7 @@ str2filter( const char *str )
return NULL; return NULL;
} }
rc = ldap_int_put_filter( ber, str ); rc = ldap_pvt_put_filter( ber, str );
if( rc < 0 ) { if( rc < 0 ) {
goto done; goto done;
} }