rework op/rs structures to deal with opeartional attributes

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

diff --git a/servers/slapd/back-ldbm/key.c b/servers/slapd/back-ldbm/key.c
index f84dd62790f0e2e98e73b5e46cbd65e80e3bb460..bff334441fd36f50ffab0ebfd6e679341e17d19f 100644 (file)
--- a/servers/slapd/back-ldbm/key.c
+++ b/servers/slapd/back-ldbm/key.c
@@ -1,8 +1,17 @@
 /* index.c - routines for dealing with attribute indexes */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -28,8 +37,7 @@ key_read(
        ID_BLOCK                *idl;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-                  "key_read: enter\n" ));
+       LDAP_LOG( INDEX, ENTRY, "key_read: enter\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> key_read\n", 0, 0, 0 );
 #endif
@@ -42,9 +50,8 @@ key_read(
        idl = idl_fetch( be, db, key );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-                  "key_read: %ld candidates\n",
-                  idl ? ID_BLOCK_NIDS(idl) : 0 ));
+       LDAP_LOG( INDEX, ENTRY, 
+                  "key_read: %ld candidates\n", idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= index_read %ld candidates\n",
               idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
@@ -69,9 +76,8 @@ key_change(
        Datum   key;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-                  "key_change: %s ID %lx\n",
-                  op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long)id ));
+       LDAP_LOG( INDEX, ENTRY, "key_change: %s ID %lx\n",
+                  op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long)id, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> key_change(%s,%lx)\n",
                op == SLAP_INDEX_ADD_OP ? "ADD":"DELETE", (long) id, 0 );
@@ -95,8 +101,7 @@ key_change(
 
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-                  "key_change: return %d\n", rc ));
+       LDAP_LOG( INDEX, ENTRY, "key_change: return %d\n", rc, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= key_change %d\n", rc, 0, 0 );
 #endif