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 4e47e78ada806fb37dab32215625f83c9e981f81..7a4f7d075e0c71dc90aa288e8f922660247b8a3a 100644 (file)
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -56,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 ); */
 
@@ -84,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 ); */
 
@@ -178,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 ); */
 
@@ -300,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
@@ -664,7 +654,7 @@ idl_delete_key (
        kstr = (char *) ch_malloc( key.dsize + 20 );
        for ( j = 0; idl->b_ids[j] != NOID; j++ ) 
        {
-               memset( &k2, 0, sizeof(k2) );
+               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;