DB: query keys are not written by berkeley db. believe me.

diff --git a/citadel/database.c b/citadel/database.c
index 26cce16330682e5b5c24f94ed4956bf2166916c7..0da1f0f19ab72ee86b75f13e90a78fdd9bdc2719 100644 (file)
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -526,7 +526,7 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb)
  * Store a piece of data.  Returns 0 if the operation was successful.  If a
  * key already exists it should be overwritten.
  */
-int cdb_store(int cdb, void *ckey, int ckeylen, void *cdata, int cdatalen)
+int cdb_store(int cdb, const void *ckey, int ckeylen, void *cdata, int cdatalen)
 {
 
        DBT dkey, ddata;
@@ -542,7 +542,9 @@ int cdb_store(int cdb, void *ckey, int ckeylen, void *cdata, int cdatalen)
        memset(&dkey, 0, sizeof(DBT));
        memset(&ddata, 0, sizeof(DBT));
        dkey.size = ckeylen;
+       /* no, we don't care for this error. */
        dkey.data = ckey;
+
        ddata.size = cdatalen;
        ddata.data = cdata;
 
@@ -680,15 +682,15 @@ static DBC *localcursor(int cdb)
  * a struct cdbdata which it is the caller's responsibility to free later on
  * using the cdb_free() routine.
  */
-struct cdbdata *cdb_fetch(int cdb, void *key, int keylen)
+struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen)
 {
-
        struct cdbdata *tempcdb;
        DBT dkey, dret;
        int ret;
 
        memset(&dkey, 0, sizeof(DBT));
        dkey.size = keylen;
+       /* no we don't care about this error. */
        dkey.data = key;
 
        if (TSD->tid != NULL) {

diff --git a/citadel/database.h b/citadel/database.h
index f693f65cfee84113c011682cc2e2e71b9c80d8c8..a9f0bbfd3a1d523a1212ec4e86bc39d2f109db10 100644 (file)
--- a/citadel/database.h
+++ b/citadel/database.h
@@ -16,9 +16,9 @@
 
 void open_databases (void);
 void close_databases (void);
-int cdb_store (int cdb, void *key, int keylen, void *data, int datalen);
+int cdb_store (int cdb, const void *key, int keylen, void *data, int datalen);
 int cdb_delete (int cdb, void *key, int keylen);
-struct cdbdata *cdb_fetch (int cdb, void *key, int keylen);
+struct cdbdata *cdb_fetch (int cdb, const void *key, int keylen);
 void cdb_free (struct cdbdata *cdb);
 void cdb_rewind (int cdb);
 struct cdbdata *cdb_next_item (int cdb);