Experimental code that uses one locker ID per thread. Seems to work OK,

[openldap] / servers / slapd / index.c

diff --git a/servers/slapd/index.c b/servers/slapd/index.c
index 8ec5a97997fa5e01ea28e23f0759c7c95a66c8a1..a3b1032f5c6ce03de047c867350c0d36e5b0437f 100644 (file)
--- a/servers/slapd/index.c
+++ b/servers/slapd/index.c
@@ -1,7 +1,7 @@
 /* index.c - index utilities */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -11,29 +11,6 @@
 
 #include "slap.h"
 
-int
-slap_index2prefix( int indextype )
-{
-       int     prefix;
-
-       switch ( indextype ) {
-       case SLAP_INDEX_EQUALITY:
-               prefix = SLAP_INDEX_EQUALITY_PREFIX;
-               break;
-       case SLAP_INDEX_APPROX:
-               prefix = SLAP_INDEX_APPROX_PREFIX;
-               break;
-       case SLAP_INDEX_SUBSTR:
-               prefix = SLAP_INDEX_SUBSTR_PREFIX;
-               break;
-       default:
-               prefix = SLAP_INDEX_UNKNOWN_PREFIX;
-               break;
-       }
-
-       return( prefix );
-}
-
 int slap_str2index( const char *str, slap_mask_t *idx )
 {
        if ( strcasecmp( str, "pres" ) == 0 ) {
@@ -52,14 +29,10 @@ int slap_str2index( const char *str, slap_mask_t *idx )
                strcasecmp( str, "sub" ) == 0 )
        {
                *idx = SLAP_INDEX_SUBSTR_DEFAULT;
-       } else if ( strcasecmp( str, "lang" ) == 0 ) {
-               *idx = SLAP_INDEX_LANG;
-       } else if ( strcasecmp( str, "autolang" ) == 0 ) {
-               *idx = SLAP_INDEX_AUTO_LANG;
-       } else if ( strcasecmp( str, "subtypes" ) == 0 ) {
-               *idx = SLAP_INDEX_SUBTYPES;
-       } else if ( strcasecmp( str, "autosubtypes" ) == 0 ) {
-               *idx = SLAP_INDEX_AUTO_SUBTYPES;
+       } else if ( strcasecmp( str, "nolang" ) == 0 ) {
+               *idx = SLAP_INDEX_NOLANG;
+       } else if ( strcasecmp( str, "nosubtypes" ) == 0 ) {
+               *idx = SLAP_INDEX_NOSUBTYPES;
        } else {
                return LDAP_OTHER;
        }