Import minor trace output cleanup

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

diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index d1e38aa197627da0f01defe370f0e66ade2b7740..7a4f7d075e0c71dc90aa288e8f922660247b8a3a 100644 (file)
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -7,12 +7,10 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "slap.h"
 #include "ldapconfig.h"
+#include "slap.h"
 #include "back-ldbm.h"
 
-extern Datum   ldbm_cache_fetch();
-
 IDList *
 idl_alloc( int nids )
 {
@@ -58,11 +56,7 @@ idl_fetch_one(
        Datum   data;
        IDList  *idl;
 
-#ifdef HAVE_BERKELEY_DB2
-       Datum   k2;
-       memset( &k2, 0, sizeof( k2 ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       ldbm_datum_init( data );
 
        /* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch_one\n", 0, 0, 0 ); */
 
@@ -86,10 +80,8 @@ idl_fetch(
        char    *kstr;
        int     i, nids;
 
-#ifdef HAVE_BERKELEY_DB2
-       memset( &k2, 0, sizeof( k2 ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       ldbm_datum_init( k2 );
+       ldbm_datum_init( data );
 
        /* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch\n", 0, 0, 0 ); */
 
@@ -163,8 +155,8 @@ idl_fetch(
        }
        free( (char *) tmp );
 
-       Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %d ids (%d max)\n", idl->b_nids,
-           idl->b_nmax, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %lu ids (%lu max)\n",
+              idl->b_nids, idl->b_nmax, 0 );
        return( idl );
 }
 
@@ -180,9 +172,7 @@ idl_store(
        Datum   data;
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
-#ifdef HAVE_BERKELEY_DB2
-       memset( &data, 0, sizeof( data ) );
-#endif
+       ldbm_datum_init( data );
 
        /* Debug( LDAP_DEBUG_TRACE, "=> idl_store\n", 0, 0, 0 ); */
 
@@ -302,9 +292,7 @@ idl_insert_key(
        char    *kstr;
        Datum   k2;
 
-#ifdef HAVE_BERKELEY_DB2
-       memset( &k2, 0, sizeof( k2 ) );
-#endif
+       ldbm_datum_init( k2 );
 
        if ( (idl = idl_fetch_one( be, db, key )) == NULL ) {
 #ifdef LDBM_DEBUG
@@ -466,7 +454,7 @@ idl_insert_key(
                        case 0:         /* id inserted */
                                if ( rc == 2 ) {
                                        Debug( LDAP_DEBUG_ANY,
-                                           "id %d already in next block\n",
+                                           "id %lu already in next block\n",
                                            id, 0, 0 );
                                }
                                free( kstr );
@@ -628,7 +616,8 @@ idl_delete_key (
 {
        Datum  k2;
        IDList *idl, *tmp;
-       int i, j, nids;
+       unsigned i;
+       int j, nids;
        char    *kstr;
 
        if ( (idl = idl_fetch_one( be, db, key ) ) == NULL )
@@ -665,8 +654,8 @@ idl_delete_key (
        kstr = (char *) ch_malloc( key.dsize + 20 );
        for ( j = 0; idl->b_ids[j] != NOID; j++ ) 
        {
-               memset( &k2, 0, sizeof(k2) );
-               sprintf( kstr, "%c%s%d", CONT_PREFIX, key.dptr, idl->b_ids[j] );
+               ldbm_datum_init( k2 );
+               sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr, idl->b_ids[j] );
                k2.dptr = kstr;
                k2.dsize = strlen( kstr ) + 1;