open_databases() and close_databases() are now cdb_open_databases() and cdb_close_dat...

diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c
index f5900ebc1e4b9f6256d7c9f6baa88850b9b84133..ebb7a469f1a455f037e653c4af02e2d1df8b471f 100644 (file)
--- a/citadel/server/citserver.c
+++ b/citadel/server/citserver.c
@@ -78,7 +78,7 @@ void master_startup(void) {
        syslog(LOG_DEBUG, "citserver: ctdl_run_dir is %s", ctdl_run_dir);
 
        syslog(LOG_INFO, "Opening databases");
-       open_databases();
+       cdb_open_databases();
 
        // Load site-specific configuration
        seed_random_number_generator();                                 // must be done before config system
@@ -138,7 +138,7 @@ int master_cleanup(int exitcode) {
 
        // Close databases
        syslog(LOG_INFO, "citserver: closing databases");
-       close_databases();
+       cdb_close_databases();
 
        // If the operator requested a halt but not an exit, halt here.
        if (shutdown_and_halt) {

diff --git a/citadel/server/database.h b/citadel/server/database.h
index 1c489712be202b7e6e29f13c1aad0209dbcbcf05..a276731eb95208040ba6dd513fff128b2ad443b4 100644 (file)
--- a/citadel/server/database.h
+++ b/citadel/server/database.h
@@ -7,21 +7,23 @@
 
 #ifndef DATABASE_H
 #define DATABASE_H
-void open_databases(void);
-void close_databases(void);
-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, const void *key, int keylen);
-void cdb_free(struct cdbdata *cdb);
-void cdb_rewind(int cdb);
-struct cdbdata *cdb_next_item(int cdb);
-void cdb_close_cursor(int cdb);
-void cdb_begin_transaction(void);
-void cdb_end_transaction(void);
-void cdb_check_handles(void);
-void cdb_trunc(int cdb);
-void cdb_chmod_data(void);
-void cdb_checkpoint(void);
-void check_handles(void *arg);
-void cdb_compact(void);
+
+void           cdb_open_databases(void);
+void           cdb_close_databases(void);
+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, const void *key, int keylen);
+void           cdb_free(struct cdbdata *cdb);
+void           cdb_rewind(int cdb);
+struct cdbdata *cdb_next_item(int cdb);
+void           cdb_close_cursor(int cdb);
+void           cdb_begin_transaction(void);
+void           cdb_end_transaction(void);
+void           cdb_check_handles(void);
+void           cdb_trunc(int cdb);
+void           cdb_chmod_data(void);
+void           cdb_checkpoint(void);
+void           check_handles(void *arg);
+void           cdb_compact(void);
+
 #endif

diff --git a/citadel/server/database_bdb.c b/citadel/server/database_bdb.c
index ef538d05d576846f21574342b27460f1fc7768a0..d37371054d6220bcf365ef6290da32dbf93d01cb 100644 (file)
--- a/citadel/server/database_bdb.c
+++ b/citadel/server/database_bdb.c
@@ -160,14 +160,14 @@ void cdb_checkpoint(void) {
 // does not exist should be created.  Note that we don't need a
 // critical section here, because there aren't any active threads
 // manipulating the database yet.
-void open_databases(void) {
+void cdb_open_databases(void) {
        int ret;
        int i;
        char dbfilename[32];
        u_int32_t flags = 0;
        int dbversion_major, dbversion_minor, dbversion_patch;
 
-       syslog(LOG_DEBUG, "db: open_databases() starting");
+       syslog(LOG_DEBUG, "db: cdb_open_databases() starting");
        syslog(LOG_DEBUG, "db:    Linked zlib: %s", zlibVersion());
        syslog(LOG_DEBUG, "db: Compiled libdb: %s", DB_VERSION_STRING);
        syslog(LOG_DEBUG, "db:   Linked libdb: %s", db_version(&dbversion_major, &dbversion_minor, &dbversion_patch));
@@ -292,7 +292,7 @@ void cdb_chmod_data(void) {
 
 
 // Close all of the db database files we've opened.  This can be done in a loop, since it's just a bunch of closes.
-void close_databases(void) {
+void cdb_close_databases(void) {
        int i;
        int ret;