Minor cleanup

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index e3b4d37feb673e60821ed43169280dc15dc3e347..4737408cae0ae22e76a76c76524069d34aa98728 100644 (file)
--- 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 50016fe6ba4f222e15f807404debd92063d1975c..64bfef197d9e0c11c79421253b9993d434a5fa8b 100644 (file)
--- 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 );