ITS#2864 removed sl_mark/sl_release code

diff --git a/servers/slapd/back-bdb/index.c b/servers/slapd/back-bdb/index.c
index 7cf7826208c7e6c939ed623dc27192c55bc60477..554b45e3ddaa95d89c3d1e63495c3c7fcf2050e9 100644 (file)
--- a/servers/slapd/back-bdb/index.c
+++ b/servers/slapd/back-bdb/index.c
@@ -164,7 +164,6 @@ static int indexer(
        const char *text;
        DB *db;
        struct berval *keys;
-       void *mark;
 
        assert( mask );
 
@@ -183,10 +182,6 @@ static int indexer(
                return LDAP_OTHER;
        }
 
-#if 0  /* No longer needed, our frees are in order so nothing accumulates */
-       mark = sl_mark(op->o_tmpmemctx);
-#endif
-
        if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
                rc = bdb_key_change( op->o_bd, db, txn, &presence_key, id, opid );
                if( rc ) {
@@ -260,9 +255,6 @@ static int indexer(
        }
 
 done:
-#if 0
-       sl_release( mark, op->o_tmpmemctx );
-#endif
        return rc;
 }
 

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index f468fbe2ab25ec2e3499a022282f14d75062e159..62bfaef46ad477995b33d8de97098ada4302b3f9 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -155,10 +155,9 @@ static int indexer(
 {
        int rc, i;
        const char *text;
-    DBCache    *db;
+       DBCache *db;
        AttributeDescription *ad = NULL;
        struct berval *keys;
-       void *mark;
 
        assert( mask );
 
@@ -181,8 +180,6 @@ static int indexer(
                return LDAP_OTHER;
        }
 
-       mark = sl_mark( op->o_tmpmemctx );
-
        if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
                key_change( op->o_bd, db, atname, id, opid );
        }
@@ -237,8 +234,6 @@ static int indexer(
 
        ldbm_cache_close( op->o_bd, db );
 
-       sl_release( mark, op->o_tmpmemctx );
-
        return LDAP_SUCCESS;
 }
 

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index bc178d040f15f92a5d3408f71e8f27afff28bc84..3af0d579cf4fbf2fa3ab555dd4d70e00991d57c7 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1075,8 +1075,6 @@ LDAP_SLAPD_F (void) sl_mem_init LDAP_P(( void ));
 LDAP_SLAPD_F (void *) sl_mem_create LDAP_P(( ber_len_t size, void *ctx ));
 LDAP_SLAPD_F (void) sl_mem_detach LDAP_P(( void *ctx, void *memctx ));
 LDAP_SLAPD_F (void) sl_mem_destroy LDAP_P(( void *key, void *data ));
-LDAP_SLAPD_F (void *) sl_mark LDAP_P(( void *ctx ));
-LDAP_SLAPD_F (void) sl_release LDAP_P(( void *, void *ctx ));
 LDAP_SLAPD_F (void *) sl_context LDAP_P(( void *ptr ));
 
 /*

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 4c862310e8ec27f4606e6772b132b66d00680b40..28ad962137ce78f13cc2d6117343eb8b15a726aa 100644 (file)
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -206,27 +206,6 @@ sl_free( void *ptr, void *ctx )
        }
 }
 
-void
-sl_release( void *ptr, void *ctx )
-{
-       struct slab_heap *sh = ctx;
-
-       if ( sh && ptr >= sh->h_base && ptr <= sh->h_end ) {
-               sh->h_last = ptr;
-       }
-}
-
-void *
-sl_mark( void *ctx )
-{
-       struct slab_heap *sh = ctx;
-       void *ret = NULL;
-
-       if (sh) ret = sh->h_last;
-
-       return ret;
-}
-
 void *
 sl_context( void *ptr )
 {