back-bdb/back-mdb IDL cleanup.

[openldap] / servers / slapd / back-mdb / index.c

diff --git a/servers/slapd/back-mdb/index.c b/servers/slapd/back-mdb/index.c
index 15d59d6b22b7263e6257bd38c1e84dd876a04926..58366c88df109e80a656355d9cd3faa28d808403 100644 (file)
--- a/servers/slapd/back-mdb/index.c
+++ b/servers/slapd/back-mdb/index.c
@@ -27,7 +27,6 @@
 
 static char presence_keyval[] = {0,0};
 static struct berval presence_key[2] = {BER_BVC(presence_keyval), BER_BVNULL};
-static MDB_val presence_mdbkey[2] = {{1, presence_keyval}, {0, NULL}};
 
 AttrInfo *mdb_index_mask(
        Backend *be,
@@ -191,7 +190,7 @@ static int indexer(
                keyfunc = mdb_idl_delete_keys;
 
        if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
-               rc = keyfunc( mc, presence_mdbkey, id );
+               rc = keyfunc( mc, presence_key, id );
                if( rc ) {
                        err = "presence";
                        goto done;
@@ -207,7 +206,7 @@ static int indexer(
                        atname, vals, &keys, op->o_tmpmemctx );
 
                if( rc == LDAP_SUCCESS && keys != NULL ) {
-                       rc = keyfunc( mc, (MDB_val *)keys, id );
+                       rc = keyfunc( mc, keys, id );
                        ber_bvarray_free_x( keys, op->o_tmpmemctx );
                        if ( rc ) {
                                err = "equality";
@@ -226,7 +225,7 @@ static int indexer(
                        atname, vals, &keys, op->o_tmpmemctx );
 
                if( rc == LDAP_SUCCESS && keys != NULL ) {
-                       rc = keyfunc( mc, (MDB_val *)keys, id );
+                       rc = keyfunc( mc, keys, id );
                        ber_bvarray_free_x( keys, op->o_tmpmemctx );
                        if ( rc ) {
                                err = "approx";
@@ -246,7 +245,7 @@ static int indexer(
                        atname, vals, &keys, op->o_tmpmemctx );
 
                if( rc == LDAP_SUCCESS && keys != NULL ) {
-                       rc = keyfunc( mc, (MDB_val *)keys, id );
+                       rc = keyfunc( mc, keys, id );
                        ber_bvarray_free_x( keys, op->o_tmpmemctx );
                        if( rc ) {
                                err = "substr";