database-related cleanups and paranoia tests;

[citadel.git] / citadel / database.c

diff --git a/citadel/database.c b/citadel/database.c
index 0276e7b1fe82a9730563eb33c421336d722f1f87..79ed9014a187ce5fe3bef932ccafd35670825b73 100644 (file)
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -23,9 +23,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_GDBM_H
 #include <gdbm.h>
-#endif
 #include "citadel.h"
 #include "server.h"
 #include "database.h"
@@ -53,11 +51,9 @@ void defrag_databases(void)
 
        /* defrag the message base */
        lprintf(7, "Defragmenting message base\n");
-       begin_critical_section(S_MSGMAIN);
        begin_critical_section(S_DATABASE);
        gdbm_reorganize(gdbms[CDB_MSGMAIN]);
        end_critical_section(S_DATABASE);
-       end_critical_section(S_MSGMAIN);
 
        /* defrag the user file, mailboxes, and user/room relationships */
        lprintf(7, "Defragmenting user file\n");
@@ -341,9 +337,8 @@ struct cdbdata *cdb_next_item(int cdb)
 }
 
 
-
 /*
- * GDBM doesn't support transaction-based logging.  Stub out these functions.
+ * empty functions because GDBM doesn't have transaction support
  */
 
 void cdb_begin_transaction(void) {
@@ -351,3 +346,12 @@ void cdb_begin_transaction(void) {
 
 void cdb_end_transaction(void) {
 }
+
+void cdb_allocate_tsd(void) {
+}
+
+void cdb_free_tsd(void) {
+}
+
+void cdb_check_handles(void) {
+}