servers/slapd/filter.c - diff

Return to filter.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/filter.c between versions 1.4 and 1.4.2.1

version 1.4, 1998/10/24 23:42:00	version 1.4.2.1, 1998/10/27 23:04:01
Line 391 filter_print( Filter *f )	Line 391 filter_print( Filter *f )
Filter *p;	Filter *p;

if ( f == NULL ) {	if ( f == NULL ) {
printf( "NULL" );	fprintf( stderr, "NULL" );
}	}

switch ( f->f_choice ) {	switch ( f->f_choice ) {
case LDAP_FILTER_EQUALITY:	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 );	f->f_ava.ava_value.bv_val );
break;	break;

case LDAP_FILTER_GE:	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 );	f->f_ava.ava_value.bv_val );
break;	break;

case LDAP_FILTER_LE:	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 );	f->f_ava.ava_value.bv_val );
break;	break;

case LDAP_FILTER_APPROX:	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 );	f->f_ava.ava_value.bv_val );
break;	break;

case LDAP_FILTER_SUBSTRINGS:	case LDAP_FILTER_SUBSTRINGS:
printf( "(%s=", f->f_sub_type );	fprintf( stderr, "(%s=", f->f_sub_type );
if ( f->f_sub_initial != NULL ) {	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 ) {	if ( f->f_sub_any != NULL ) {
for ( i = 0; f->f_sub_any[i] != NULL; i++ ) {	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 );	charray_free( f->f_sub_any );
if ( f->f_sub_final != NULL ) {	if ( f->f_sub_final != NULL ) {
printf( "*%s", f->f_sub_final );	fprintf( stderr, "*%s", f->f_sub_final );
}	}
break;	break;

case LDAP_FILTER_PRESENT:	case LDAP_FILTER_PRESENT:
printf( "%s=*", f->f_type );	fprintf( stderr, "%s=*", f->f_type );
break;	break;

case LDAP_FILTER_AND:	case LDAP_FILTER_AND:
case LDAP_FILTER_OR:	case LDAP_FILTER_OR:
case LDAP_FILTER_NOT:	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 ? '\|' : '!' );	f->f_choice == LDAP_FILTER_OR ? '\|' : '!' );
for ( p = f->f_list; p != NULL; p = p->f_next ) {	for ( p = f->f_list; p != NULL; p = p->f_next ) {
filter_print( p );	filter_print( p );
}	}
printf( ")" );	fprintf( stderr, ")" );
break;	break;

default:	default:
printf( "unknown type %d", f->f_choice );	fprintf( stderr, "unknown type %d", f->f_choice );
break;	break;
}	}
}	}

Removed from v.1.4
changed lines
	Added in v.1.4.2.1