Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / database.h

diff --git a/citadel/database.h b/citadel/database.h
index c7fe3833eca7e18707a193ae8e663e6eb18f2456..a9f0bbfd3a1d523a1212ec4e86bc39d2f109db10 100644 (file)
--- a/citadel/database.h
+++ b/citadel/database.h
@@ -1,10 +1,24 @@
-/* $Id$ */
-void defrag_databases (void);
+/*
+ * Copyright (c) 1987-2012 by the citadel.org team
+ *
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef DATABASE_H
+#define DATABASE_H
+
+
 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);
@@ -18,6 +32,7 @@ void cdb_trunc(int cdb);
 void *checkpoint_thread(void *arg);
 void cdb_chmod_data(void);
 void cdb_checkpoint(void);
+void check_handles(void *arg);
 
 /*
  * Database records beginning with this magic number are assumed to
@@ -36,4 +51,5 @@ struct CtdlCompressHeader {
        size_t compressed_len;
 };
 
+#endif /* DATABASE_H */