Fixes for NO_THREADS

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

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index fc8e85059ed8f97fc064f676d34d7e156db6669d..f5078c0051313dffcc2ff3e3940e31349b07cba6 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -68,7 +68,6 @@ int index_is_indexed(
        Backend *be,
        AttributeDescription *desc )
 {
-       int rc;
        slap_mask_t mask;
        char *dbname;
        struct berval prefix;
@@ -79,7 +78,7 @@ int index_is_indexed(
                return LDAP_INAPPROPRIATE_MATCHING;
        }
 
-       return LDAP_SUCCESS;
+       return LDAP_SUCCESS;
 }
 
 int index_param(
@@ -161,9 +160,8 @@ static int indexer(
        
        if ( db == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "index", LDAP_LEVEL_ERR,
-                          "index_read: Could not open db %s%s\n",
-                          dbname, LDBM_SUFFIX ));
+               LDAP_LOG( INDEX, ERR, 
+                          "index_read: Could not open db %s%s\n", dbname, LDBM_SUFFIX, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                    "<= index_read NULL (could not open %s%s)\n",
@@ -300,10 +298,9 @@ index_entry(
        Attribute *ap )
 {
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-                  "index_entry: %s (%s)%ld\n",
-                  op == SLAP_INDEX_ADD_OP ? "add" : "del",
-                  e->e_dn, e->e_id ));
+       LDAP_LOG( INDEX, ENTRY, 
+               "index_entry: %s (%s)%ld\n", op == SLAP_INDEX_ADD_OP ? "add" : "del",
+               e->e_dn, e->e_id );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
                op == SLAP_INDEX_ADD_OP ? "add" : "del",
@@ -316,8 +313,7 @@ index_entry(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-                  "index_entry: success\n" ));
+       LDAP_LOG( INDEX, ENTRY, "index_entry: success\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= index_entry_%s( %ld, \"%s\" ) success\n",
            op == SLAP_INDEX_ADD_OP ? "add" : "del",