From 0a5ab66d6973b5cc82c9692a183ba4cf500cf56d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 20 Aug 1998 08:10:06 +0000 Subject: [PATCH] Minor cleanup --- servers/slapd/charray.c | 4 ++-- servers/slapd/filter.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c index e3b4d37feb..4737408cae 100644 --- a/servers/slapd/charray.c +++ b/servers/slapd/charray.c @@ -107,14 +107,14 @@ charray_dup( char **a ) } char ** -str2charray( char *str_in, char *brkstr ) +str2charray( char *str, char *brkstr ) { char **res; char *s; int i; /* protect the input string from strtok */ - char *str = strdup( str_in ); + char *str = strdup( str ); i = 1; for ( s = str; *s; s++ ) { diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c index 50016fe6ba..64bfef197d 100644 --- a/servers/slapd/filter.c +++ b/servers/slapd/filter.c @@ -135,7 +135,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr ) Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 ); if ( (err = get_filter_list( conn, ber, &f->f_and, &ftmp )) == 0 ) { - if (ftmp == NULL) ftmp = strdup(""); + if (ftmp == NULL) ftmp = strdup(""); *fstr = ch_malloc( 4 + strlen( ftmp ) ); sprintf( *fstr, "(&%s)", ftmp ); free( ftmp ); @@ -146,7 +146,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr ) Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 ); if ( (err = get_filter_list( conn, ber, &f->f_or, &ftmp )) == 0 ) { - if (ftmp == NULL) ftmp = strdup(""); + if (ftmp == NULL) ftmp = strdup(""); *fstr = ch_malloc( 4 + strlen( ftmp ) ); sprintf( *fstr, "(|%s)", ftmp ); free( ftmp ); @@ -157,7 +157,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr ) Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 ); (void) ber_skip_tag( ber, &len ); if ( (err = get_filter( conn, ber, &f->f_not, &ftmp )) == 0 ) { - if (ftmp == NULL) ftmp = strdup(""); + if (ftmp == NULL) ftmp = strdup(""); *fstr = ch_malloc( 4 + strlen( ftmp ) ); sprintf( *fstr, "(!%s)", ftmp ); free( ftmp ); -- 2.39.5