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 683d30a2e56c4019e6c484bb812c0d6d140790ab..31fd29618567e3fa92d8f73104e202837f21c56f 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -76,7 +76,7 @@ dn2id(
        /* first check the cache */
        if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
                free( dn );
-               Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu (in cache)\n", id,
+               Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", id,
                        0, 0 );
                return( id );
        }
@@ -106,7 +106,7 @@ dn2id(
 
        ldbm_datum_free( db->dbc_db, data );
 
-       Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu\n", id, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", id, 0, 0 );
        return( id );
 }
 
@@ -153,8 +153,8 @@ dn2id_delete(
  * entry.
  */
 
-static Entry *
-dn2entry(
+Entry *
+dn2entry_rw(
     Backend    *be,
     char       *dn,
     char       **matched,
@@ -172,14 +172,14 @@ dn2entry(
        *matched = NULL;
 
        if ( (id = dn2id( be, dn )) != NOID &&
-               (e = id2entry( be, id, rw )) != NULL )
+               (e = 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 */
@@ -208,25 +208,3 @@ dn2entry(
        return( NULL );
 }
 
-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 ) );
-}
-
-
-