Code clean-up.

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

diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index d8e1db98865458584c138f1feb5b2a0f94e739d9..904a37f970f72977a70e2ed5fdfd135ec5677fc2 100644 (file)
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -20,12 +20,12 @@ id2children_add(
        struct dbcache  *db;
        Datum           key;
        int             len, rc;
-       IDList          *idl;
+       ID_BLOCK                *idl;
        char            buf[20];
 
        ldbm_datum_init( key );
 
-       Debug( LDAP_DEBUG_TRACE, "=> id2children_add( %lu, %lu )\n",
+       Debug( LDAP_DEBUG_TRACE, "=> id2children_add( %ld, %ld )\n",
               p ? p->e_id : 0, e->e_id, 0 );
 
        if ( (db = ldbm_cache_open( be, "id2children", LDBM_SUFFIX,
@@ -64,10 +64,10 @@ id2children_remove(
        struct dbcache  *db;
        Datum           key;
        int             len, rc;
-       IDList          *idl;
+       ID_BLOCK                *idl;
        char            buf[20];
 
-       Debug( LDAP_DEBUG_TRACE, "=> id2children_remove( %lu, %lu )\n", p ? p->e_id
+       Debug( LDAP_DEBUG_TRACE, "=> id2children_remove( %ld, %ld )\n", p ? p->e_id
            : 0, e->e_id, 0 );
 
        if ( (db = ldbm_cache_open( be, "id2children", LDBM_SUFFIX,
@@ -104,13 +104,13 @@ has_children(
 {
        struct dbcache  *db;
        Datum           key;
-       int             rc;
-       IDList          *idl;
+       int             rc = 0;
+       ID_BLOCK                *idl;
        char            buf[20];
 
        ldbm_datum_init( key );
 
-       Debug( LDAP_DEBUG_TRACE, "=> has_children( %lu )\n", p->e_id , 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "=> has_children( %ld )\n", p->e_id , 0, 0 );
 
        if ( (db = ldbm_cache_open( be, "id2children", LDBM_SUFFIX,
            LDBM_WRCREAT )) == NULL ) {
@@ -127,9 +127,13 @@ has_children(
        idl = idl_fetch( be, db, key );
 
        ldbm_cache_close( be, db );
-       rc = idl ? 1 : 0;
-       idl_free( idl );
 
-       Debug( LDAP_DEBUG_TRACE, "<= has_children %d\n", rc, 0, 0 );
+       if( idl != NULL ) {
+               idl_free( idl );
+               rc = 1;
+       }
+
+       Debug( LDAP_DEBUG_TRACE, "<= has_children( %ld ): %s\n",
+               p->e_id, rc ? "yes" : "no", 0 );
        return( rc );
 }