Code clean-up.

[openldap] / servers / slapd / back-ldbm / index.c

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 9ac95992d960563f7e1f5cdcf6ba26c8f1c22327..0d595119c693d912dc4be00fc6fc9b95af80d9e2 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -111,7 +111,7 @@ index_read(
        if ( ! (indextype & indexmask) ) {
                idl =  idl_allids( be );
                Debug( LDAP_DEBUG_TRACE,
-                   "<= index_read %lu candidates (allids - not indexed)\n",
+                   "<= index_read %ld candidates (allids - not indexed)\n",
                    idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
                return( idl );
        }
@@ -151,7 +151,7 @@ index_read(
 
        ldbm_cache_close( be, db );
 
-       Debug( LDAP_DEBUG_TRACE, "<= index_read %lu candidates\n",
+       Debug( LDAP_DEBUG_TRACE, "<= index_read %ld candidates\n",
            idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
        return( idl );
 }
@@ -168,19 +168,17 @@ add_value(
 {
        int     rc;
        Datum   key;
-       ID_BLOCK        *idl;
-       char    prefix;
-       char    *realval, *tmpval, *s;
+       ID_BLOCK        *idl = NULL;
+       char    *tmpval = NULL;
+       char    *realval = val;
        char    buf[BUFSIZ];
 
+       char    prefix = index2prefix( indextype );
+
        ldbm_datum_init( key );
 
-       prefix = index2prefix( indextype );
        Debug( LDAP_DEBUG_TRACE, "=> add_value( \"%c%s\" )\n", prefix, val, 0 );
 
-       realval = val;
-       tmpval = NULL;
-       idl = NULL;
        if ( prefix != UNKNOWN_PREFIX ) {
               unsigned int     len = strlen( val );
 
@@ -203,7 +201,10 @@ add_value(
        if ( tmpval != NULL ) {
                free( tmpval );
        }
-       idl_free( idl );
+
+       if( idl != NULL ) {
+               idl_free( idl );
+       }
 
        ldap_pvt_thread_yield();