Code clean-up.

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

diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 89a5ea13eac76794c64eda97415471a6da033a65..31fd29618567e3fa92d8f73104e202837f21c56f 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -3,17 +3,14 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 #include "back-ldbm.h"
 #include "proto-back-ldbm.h"
 
-extern struct dbcache  *ldbm_cache_open();
-extern char            *dn_parent();
-extern Datum           ldbm_cache_fetch();
-
 int
 dn2id_add(
     Backend    *be,
@@ -26,10 +23,8 @@ dn2id_add(
        Datum           key, data;
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       ldbm_datum_init( key );
+       ldbm_datum_init( data );
 
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
 
@@ -40,7 +35,7 @@ dn2id_add(
                return( -1 );
        }
 
-       dn = strdup( dn );
+       dn = ch_strdup( dn );
        dn_normalize_case( dn );
 
        key.dptr = dn;
@@ -49,7 +44,7 @@ dn2id_add(
        data.dsize = sizeof(ID);
 
        flags = LDBM_INSERT;
-       if ( li->li_flush_wrt ) flags |= LDBM_SYNC;
+       if ( li->li_dbcachewsync ) flags |= LDBM_SYNC;
 
        rc = ldbm_cache_store( db, key, data, flags );
 
@@ -71,19 +66,17 @@ dn2id(
        ID              id;
        Datum           key, data;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       ldbm_datum_init( key );
+       ldbm_datum_init( data );
 
-       dn = strdup( dn );
+       dn = ch_strdup( dn );
        Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
        dn_normalize_case( dn );
 
        /* first check the cache */
        if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
                free( dn );
-               Debug( LDAP_DEBUG_TRACE, "<= dn2id %d (in cache)\n", id,
+               Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", id,
                        0, 0 );
                return( id );
        }
@@ -113,7 +106,7 @@ dn2id(
 
        ldbm_datum_free( db->dbc_db, data );
 
-       Debug( LDAP_DEBUG_TRACE, "<= dn2id %d\n", id, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", id, 0, 0 );
        return( id );
 }
 
@@ -128,9 +121,7 @@ dn2id_delete(
        Datum           key;
        int             rc;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
-#endif
+       ldbm_datum_init( key );
 
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\" )\n", dn, 0, 0 );
 
@@ -142,12 +133,15 @@ dn2id_delete(
                return( -1 );
        }
 
+       dn = ch_strdup( dn );
        dn_normalize_case( dn );
        key.dptr = dn;
        key.dsize = strlen( dn ) + 1;
 
        rc = ldbm_cache_delete( db, key );
 
+       free( dn );
+
        ldbm_cache_close( be, db );
 
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
@@ -159,8 +153,8 @@ dn2id_delete(
  * entry.
  */
 
-static Entry *
-dn2entry(
+Entry *
+dn2entry_rw(
     Backend    *be,
     char       *dn,
     char       **matched,
@@ -169,18 +163,27 @@ dn2entry(
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        ID              id;
-       Entry           *e;
+       Entry           *e = NULL;
        char            *pdn;
 
-       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: %s\n",
+       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
                rw ? "w" : "r", dn, 0);
 
+       *matched = NULL;
+
        if ( (id = dn2id( be, dn )) != NOID &&
-               (e = id2entry( be, id, rw )) != NULL )
+               (e = id2entry_rw( be, id, rw )) != NULL )
        {
                return( e );
        }
-       *matched = NULL;
+
+       if ( id != NOID ) {
+               Debug(LDAP_DEBUG_ANY,
+                       "dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
+                       rw ? "w" : "r", id, dn);
+               /* must have been deleted from underneath us */
+               /* treat as if NOID was found */
+       }
 
        /* stop when we get to the suffix */
        if ( be_issuffix( be, dn ) ) {
@@ -191,6 +194,9 @@ dn2entry(
        if ( (pdn = dn_parent( be, dn )) != NULL ) {
                /* get entry with reader lock */
                if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
+                       if(*matched != NULL) {
+                               free(*matched);
+                       }
                        *matched = pdn;
                        /* free entry with reader lock */
                        cache_return_entry_r( &li->li_cache, e );
@@ -202,38 +208,3 @@ dn2entry(
        return( NULL );
 }
 
-#if 0
-               if (e->e_state == ENTRY_STATE_DELETED)
-                       continue;
-
-               if (strcmp(dn, e->e_dn) != 0)
-                       continue;
-
-               /* return locked entry entry */
-               return(e);
-       }
-}
-#endif
-
-Entry *
-dn2entry_r(
-       Backend *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 0 ) );
-}
-
-Entry *
-dn2entry_w(
-       Backend *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 1 ) );
-}
-
-
-