X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilter.c;h=86d8dabcff7d5f0ca86f458279631a32ae04ea41;hb=a8efbbeef4dbc9f48efda1eae0ca77e9365a8f46;hp=be8a8ea2425d0b5013aaccd8665987555a8c6793;hpb=c0f5c884297aac7b930afad98f601912c83e9e72;p=openldap

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index be8a8ea242..86d8dabcff 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -9,12 +9,8 @@
 
 #include "slap.h"
 
-static int	get_filter_list();
-static int	get_substring_filter();
-
-extern int	get_ava();
-extern char	*ch_malloc();
-extern char	*ch_realloc();
+static int	get_filter_list(Connection *conn, BerElement *ber, Filter **f, char **fstr);
+static int	get_substring_filter(Connection *conn, BerElement *ber, Filter *f, char **fstr);
 
 int
 get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
@@ -168,8 +164,8 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 		break;
 
 	default:
-		Debug( LDAP_DEBUG_ANY, "unknown filter type %d\n", f->f_choice,
-		    0, 0 );
+		Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n",
+		       f->f_choice, 0, 0 );
 		err = LDAP_PROTOCOL_ERROR;
 		break;
 	}
@@ -375,8 +371,8 @@ filter_free( Filter *f )
 		break;
 
 	default:
-		Debug( LDAP_DEBUG_ANY, "unknown filter type %d\n", f->f_choice,
-		    0, 0 );
+		Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n",
+		       f->f_choice, 0, 0 );
 		break;
 	}
 	free( f );
@@ -391,63 +387,63 @@ filter_print( Filter *f )
 	Filter	*p;
 
 	if ( f == NULL ) {
-		printf( "NULL" );
+		fprintf( stderr, "NULL" );
 	}
 
 	switch ( f->f_choice ) {
 	case LDAP_FILTER_EQUALITY:
-		printf( "(%s=%s)", f->f_ava.ava_type,
+		fprintf( stderr, "(%s=%s)", f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
 		break;
 
 	case LDAP_FILTER_GE:
-		printf( "(%s>=%s)", f->f_ava.ava_type,
+		fprintf( stderr, "(%s>=%s)", f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
 		break;
 
 	case LDAP_FILTER_LE:
-		printf( "(%s<=%s)", f->f_ava.ava_type,
+		fprintf( stderr, "(%s<=%s)", f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
 		break;
 
 	case LDAP_FILTER_APPROX:
-		printf( "(%s~=%s)", f->f_ava.ava_type,
+		fprintf( stderr, "(%s~=%s)", f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
-		printf( "(%s=", f->f_sub_type );
+		fprintf( stderr, "(%s=", f->f_sub_type );
 		if ( f->f_sub_initial != NULL ) {
-			printf( "%s", f->f_sub_initial );
+			fprintf( stderr, "%s", f->f_sub_initial );
 		}
 		if ( f->f_sub_any != NULL ) {
 			for ( i = 0; f->f_sub_any[i] != NULL; i++ ) {
-				printf( "*%s", f->f_sub_any[i] );
+				fprintf( stderr, "*%s", f->f_sub_any[i] );
 			}
 		}
 		charray_free( f->f_sub_any );
 		if ( f->f_sub_final != NULL ) {
-			printf( "*%s", f->f_sub_final );
+			fprintf( stderr, "*%s", f->f_sub_final );
 		}
 		break;
 
 	case LDAP_FILTER_PRESENT:
-		printf( "%s=*", f->f_type );
+		fprintf( stderr, "%s=*", f->f_type );
 		break;
 
 	case LDAP_FILTER_AND:
 	case LDAP_FILTER_OR:
 	case LDAP_FILTER_NOT:
-		printf( "(%c", f->f_choice == LDAP_FILTER_AND ? '&' :
+		fprintf( stderr, "(%c", f->f_choice == LDAP_FILTER_AND ? '&' :
 		    f->f_choice == LDAP_FILTER_OR ? '|' : '!' );
 		for ( p = f->f_list; p != NULL; p = p->f_next ) {
 			filter_print( p );
 		}
-		printf( ")" );
+		fprintf( stderr, ")" );
 		break;
 
 	default:
-		printf( "unknown type %d", f->f_choice );
+		fprintf( stderr, "unknown type %lu", f->f_choice );
 		break;
 	}
 }