Change 'unsigned long len' to ber_len_t in get_filter()

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

diff --git a/servers/slapd/back-bdb2/id2children.c b/servers/slapd/back-bdb2/id2children.c
index c1fc26e2521b3d1e6669d273d5835bea486176ba..d4784d5bd8a42a9bbe8927ae8ecc195f842b7991 100644 (file)
--- a/servers/slapd/back-bdb2/id2children.c
+++ b/servers/slapd/back-bdb2/id2children.c
@@ -19,20 +19,18 @@ bdb2i_id2children_add(
 {
        struct dbcache  *db;
        Datum           key;
-       int             len, rc;
-       ID_BLOCK                *idl;
        char            buf[20];
 
        ldbm_datum_init( key );
 
-       Debug( LDAP_DEBUG_TRACE, "=> bdb2i_id2children_add( %lu, %lu )\n",
+       Debug( LDAP_DEBUG_TRACE, "=> bdb2i_id2children_add( %ld, %ld )\n",
               p ? p->e_id : 0, e->e_id, 0 );
 
-       if ( (db = bdb2i_cache_open( be, "id2children", LDBM_SUFFIX,
+       if ( (db = bdb2i_cache_open( be, "id2children", BDB2_SUFFIX,
            LDBM_WRCREAT )) == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                    "<= bdb2i_id2children_add -1 could not open \"id2children%s\"\n",
-                   LDBM_SUFFIX, 0, 0 );
+                   BDB2_SUFFIX, 0, 0 );
                return( -1 );
        }
 
@@ -63,18 +61,16 @@ bdb2i_id2children_remove(
 {
        struct dbcache  *db;
        Datum           key;
-       int             len, rc;
-       ID_BLOCK                *idl;
        char            buf[20];
 
-       Debug( LDAP_DEBUG_TRACE, "=> bdb2i_id2children_remove( %lu, %lu )\n",
+       Debug( LDAP_DEBUG_TRACE, "=> bdb2i_id2children_remove( %ld, %ld )\n",
                p ? p->e_id : 0, e->e_id, 0 );
 
-       if ( (db = bdb2i_cache_open( be, "id2children", LDBM_SUFFIX,
+       if ( (db = bdb2i_cache_open( be, "id2children", BDB2_SUFFIX,
            LDBM_WRCREAT )) == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                    "<= bdb2i_id2children_remove -1 could not open \"id2children%s\"\n",
-                   LDBM_SUFFIX, 0, 0 );
+                   BDB2_SUFFIX, 0, 0 );
                return( -1 );
        }
 
@@ -110,13 +106,13 @@ bdb2i_has_children(
 
        ldbm_datum_init( key );
 
-       Debug( LDAP_DEBUG_TRACE, "=> bdb2i_has_children( %lu )\n", p->e_id , 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "=> bdb2i_has_children( %ld )\n", p->e_id , 0, 0 );
 
-       if ( (db = bdb2i_cache_open( be, "id2children", LDBM_SUFFIX,
+       if ( (db = bdb2i_cache_open( be, "id2children", BDB2_SUFFIX,
            LDBM_WRCREAT )) == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                    "<= bdb2i_has_children -1 could not open \"id2children%s\"\n",
-                   LDBM_SUFFIX, 0, 0 );
+                   BDB2_SUFFIX, 0, 0 );
                return( 0 );
        }
 
@@ -133,7 +129,7 @@ bdb2i_has_children(
                rc = 1;
        }
 
-       Debug( LDAP_DEBUG_TRACE, "<= bdb2i_has_children( %lu ): %s\n",
+       Debug( LDAP_DEBUG_TRACE, "<= bdb2i_has_children( %ld ): %s\n",
                                        p->e_id, rc ? "yes" : "no", 0 );
        return( rc );
 }