Move LDBM-backend specific fields of Entry struct into a private struct.

[openldap] / servers / slapd / back-ldbm / proto-back-ldbm.h

diff --git a/servers/slapd/back-ldbm/proto-back-ldbm.h b/servers/slapd/back-ldbm/proto-back-ldbm.h
index c5d8ce936a072b75afcd1c74f7ad5e3f35733fb2..a0abc0d86795ffd7ecb94ef525f68b01e3ed2e1a 100644 (file)
--- a/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -3,6 +3,8 @@
 
 #include <ldap_cdefs.h>
 
+#include "external.h"
+
 LDAP_BEGIN_DECL
 
 /*
@@ -35,7 +37,9 @@ void attr_index_config LDAP_P(( struct ldbminfo *li, char *fname, int lineno,
 void cache_set_state LDAP_P(( struct cache *cache, Entry *e, int state ));
 void cache_return_entry_r LDAP_P(( struct cache *cache, Entry *e ));
 void cache_return_entry_w LDAP_P(( struct cache *cache, Entry *e ));
-int cache_add_entry_lock LDAP_P(( struct cache *cache, Entry *e, int state ));
+int cache_add_entry_rw LDAP_P(( struct cache *cache, Entry *e,
+       int state, int rw ));
+int cache_update_entry LDAP_P(( struct cache *cache, Entry *e ));
 ID cache_find_entry_dn2id LDAP_P(( Backend *be, struct cache *cache, char *dn ));
 Entry * cache_find_entry_id LDAP_P(( struct cache *cache, ID id, int rw ));
 int cache_delete_entry LDAP_P(( struct cache *cache, Entry *e ));
@@ -67,7 +71,7 @@ Entry * dn2entry_w LDAP_P(( Backend *be, char *dn, char **matched ));
  * filterindex.c
  */
 
-IDList * filter_candidates LDAP_P(( Backend *be, Filter *f ));
+ID_BLOCK * filter_candidates LDAP_P(( Backend *be, Filter *f ));
 
 /*
  * id2children.c
@@ -83,7 +87,7 @@ int has_children LDAP_P(( Backend *be, Entry *p ));
 
 int id2entry_add LDAP_P(( Backend *be, Entry *e ));
 int id2entry_delete LDAP_P(( Backend *be, Entry *e ));
-Entry * id2entry LDAP_P(( Backend *be, ID id, int rw )); 
+Entry * id2entry_rw LDAP_P(( Backend *be, ID id, int rw )); 
 Entry * id2entry_r LDAP_P(( Backend *be, ID id ));
 Entry * id2entry_w LDAP_P(( Backend *be, ID id ));
 
@@ -91,18 +95,18 @@ Entry * id2entry_w LDAP_P(( Backend *be, ID id ));
  * idl.c
  */
 
-IDList * idl_alloc LDAP_P(( int nids ));
-IDList * idl_allids LDAP_P(( Backend *be ));
-void idl_free LDAP_P(( IDList *idl ));
-IDList * idl_fetch LDAP_P(( Backend *be, struct dbcache *db, Datum key ));
+ID_BLOCK * idl_alloc LDAP_P(( int nids ));
+ID_BLOCK * idl_allids LDAP_P(( Backend *be ));
+void idl_free LDAP_P(( ID_BLOCK *idl ));
+ID_BLOCK * idl_fetch LDAP_P(( Backend *be, struct dbcache *db, Datum key ));
 int idl_insert_key LDAP_P(( Backend *be, struct dbcache *db, Datum key, ID id ));
-int idl_insert LDAP_P(( IDList **idl, ID id, int maxids ));
+int idl_insert LDAP_P(( ID_BLOCK **idl, ID id, int maxids ));
 int idl_delete_key LDAP_P(( Backend *be, struct dbcache *db, Datum key, ID id ));
-IDList * idl_intersection LDAP_P(( Backend *be, IDList *a, IDList *b ));
-IDList * idl_union LDAP_P(( Backend *be, IDList *a, IDList *b ));
-IDList * idl_notin LDAP_P(( Backend *be, IDList *a, IDList *b ));
-ID idl_firstid LDAP_P(( IDList *idl ));
-ID idl_nextid LDAP_P(( IDList *idl, ID id ));
+ID_BLOCK * idl_intersection LDAP_P(( Backend *be, ID_BLOCK *a, ID_BLOCK *b ));
+ID_BLOCK * idl_union LDAP_P(( Backend *be, ID_BLOCK *a, ID_BLOCK *b ));
+ID_BLOCK * idl_notin LDAP_P(( Backend *be, ID_BLOCK *a, ID_BLOCK *b ));
+ID idl_firstid LDAP_P(( ID_BLOCK *idl ));
+ID idl_nextid LDAP_P(( ID_BLOCK *idl, ID id ));
 
 /*
  * index.c
@@ -110,7 +114,7 @@ ID idl_nextid LDAP_P(( IDList *idl, ID id ));
 
 int index_add_entry LDAP_P(( Backend *be, Entry *e ));
 int index_add_mods LDAP_P(( Backend *be, LDAPModList *ml, ID id ));
-IDList * index_read LDAP_P(( Backend *be, char *type, int indextype, char *val ));
+ID_BLOCK * index_read LDAP_P(( Backend *be, char *type, int indextype, char *val ));
 int index_add_values LDAP_P(( Backend *be, char *type, struct berval **vals, ID  id ));
 
 /*
@@ -128,6 +132,7 @@ int index_add_values LDAP_P(( Backend *be, char *type, struct berval **vals, ID
 ID next_id LDAP_P(( Backend *be ));
 void next_id_return LDAP_P(( Backend *be, ID id ));
 ID next_id_get LDAP_P(( Backend *be ));
+int next_id_save LDAP_P(( Backend *be ));
 
 LDAP_END_DECL
 #endif