Factor out ldif2* intialization to ldif2common.c

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

diff --git a/servers/slapd/back-bdb2/dn2id.c b/servers/slapd/back-bdb2/dn2id.c
index 49e192ba7435c4d9a3d9005af63b9e66971b9f24..35b1081d2bd3862238377c5cca73c56d8f7d4236 100644 (file)
--- a/servers/slapd/back-bdb2/dn2id.c
+++ b/servers/slapd/back-bdb2/dn2id.c
@@ -28,15 +28,15 @@ bdb2i_dn2id_add(
 
        Debug( LDAP_DEBUG_TRACE, "=> bdb2i_dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
 
-       if ( (db = bdb2i_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
+       if ( (db = bdb2i_cache_open( be, "dn2id", BDB2_SUFFIX, LDBM_WRCREAT ))
            == NULL ) {
                Debug( LDAP_DEBUG_ANY, "Could not open/create dn2id%s\n",
-                   LDBM_SUFFIX, 0, 0 );
+                   BDB2_SUFFIX, 0, 0 );
                return( -1 );
        }
 
        dn = ch_strdup( dn );
-       dn_normalize_case( dn );
+       (void) dn_normalize_case( dn );
 
        key.dptr = dn;
        key.dsize = strlen( dn ) + 1;
@@ -71,21 +71,21 @@ bdb2i_dn2id(
 
        dn = ch_strdup( dn );
        Debug( LDAP_DEBUG_TRACE, "=> bdb2i_dn2id( \"%s\" )\n", dn, 0, 0 );
-       dn_normalize_case( dn );
+       (void) dn_normalize_case( dn );
 
        /* first check the cache */
        if ( (id = bdb2i_cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
                free( dn );
-               Debug( LDAP_DEBUG_TRACE, "<= bdb2i_dn2id %lu (in cache)\n", id,
+               Debug( LDAP_DEBUG_TRACE, "<= bdb2i_dn2id %ld (in cache)\n", id,
                        0, 0 );
                return( id );
        }
 
-       if ( (db = bdb2i_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
+       if ( (db = bdb2i_cache_open( be, "dn2id", BDB2_SUFFIX, LDBM_WRCREAT ))
                == NULL ) {
                free( dn );
                Debug( LDAP_DEBUG_ANY, "<= bdb2i_dn2id could not open dn2id%s\n",
-                       LDBM_SUFFIX, 0, 0 );
+                       BDB2_SUFFIX, 0, 0 );
                return( NOID );
        }
 
@@ -106,7 +106,7 @@ bdb2i_dn2id(
 
        ldbm_datum_free( db->dbc_db, data );
 
-       Debug( LDAP_DEBUG_TRACE, "<= bdb2i_dn2id %lu\n", id, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<= bdb2i_dn2id %ld\n", id, 0, 0 );
        return( id );
 }
 
@@ -116,7 +116,6 @@ bdb2i_dn2id_delete(
     char       *dn
 )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        struct dbcache  *db;
        Datum           key;
        int             rc;
@@ -125,16 +124,16 @@ bdb2i_dn2id_delete(
 
        Debug( LDAP_DEBUG_TRACE, "=> bdb2i_dn2id_delete( \"%s\" )\n", dn, 0, 0 );
 
-       if ( (db = bdb2i_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
+       if ( (db = bdb2i_cache_open( be, "dn2id", BDB2_SUFFIX, LDBM_WRCREAT ))
            == NULL ) {
                Debug( LDAP_DEBUG_ANY,
-                   "<= bdb2i_dn2id_delete could not open dn2id%s\n", LDBM_SUFFIX,
+                   "<= bdb2i_dn2id_delete could not open dn2id%s\n", BDB2_SUFFIX,
                    0, 0 );
                return( -1 );
        }
 
        dn = ch_strdup( dn );
-       dn_normalize_case( dn );
+       (void) dn_normalize_case( dn );
        key.dptr = dn;
        key.dsize = strlen( dn ) + 1;
 
@@ -153,11 +152,11 @@ bdb2i_dn2id_delete(
  * entry.
  */
 
-static Entry *
-dn2entry(
+Entry *
+bdb2i_dn2entry_rw(
     BackendDB  *be,
     char       *dn,
-    char       **matched,
+    Entry      **matched,
     int         rw
 )
 {
@@ -169,64 +168,39 @@ dn2entry(
        Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
                rw ? "w" : "r", dn, 0);
 
-       *matched = NULL;
+       if( matched != NULL ) {
+               /* caller cares about match */
+               *matched = NULL;
+       }
 
        if ( (id = bdb2i_dn2id( be, dn )) != NOID &&
-               (e = bdb2i_id2entry( be, id, rw )) != NULL )
+               (e = bdb2i_id2entry_rw( be, id, rw )) != NULL )
        {
                return( e );
        }
 
        if ( id != NOID ) {
                Debug(LDAP_DEBUG_ANY,
-                       "dn2entry_%s: no entry for valid id (%lu), dn \"%s\"\n",
+                       "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 ) ) {
-               return( NULL );
-       }
+       /* caller doesn't care about match */
+       if( matched == NULL ) return NULL;
 
        /* entry does not exist - see how much of the dn does exist */
+       /* dn_parent checks returns NULL if dn is suffix */
        if ( (pdn = dn_parent( be, dn )) != NULL ) {
                /* get entry with reader lock */
                if ( (e = bdb2i_dn2entry_r( be, pdn, matched )) != NULL ) {
-                       if(*matched != NULL) {
-                               free(*matched);
-                       }
-                       *matched = pdn;
-                       /* free entry with reader lock */
-                       bdb2i_cache_return_entry_r( &li->li_cache, e );
-               } else {
-                       free( pdn );
+                       *matched = e;
                }
+               free( pdn );
        }
 
        return( NULL );
 }
 
-Entry *
-bdb2i_dn2entry_r(
-       BackendDB       *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 0 ) );
-}
-
-Entry *
-bdb2i_dn2entry_w(
-       BackendDB       *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 1 ) );
-}
-
-