From 0380025bfd4b4961127967afc793bf3453e40446 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 27 Dec 2008 04:28:00 +0000 Subject: [PATCH] * database.c: removed some code that had been commented out for a long time --- citadel/database.c | 17 +++-------------- citadel/modules/calendar/serv_calendar.c | 4 ++-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/citadel/database.c b/citadel/database.c index 9aa870091..87e7b2a58 100644 --- a/citadel/database.c +++ b/citadel/database.c @@ -78,7 +78,7 @@ void cdb_verbose_log(const DB_ENV *dbenv, const char *msg) /* Verbose logging callback */ void cdb_verbose_err(const DB_ENV *dbenv, const char *errpfx, const char *msg) { - CtdlLogPrintf(CTDL_ALERT, "BDB: %s\n", msg); + CtdlLogPrintf(CTDL_ALERT, "DB: %s\n", msg); } @@ -224,22 +224,11 @@ void cmd_cull(char *argbuf) { /* - * Request a checkpoint of the database. + * Request a checkpoint of the database. Called once per minute by the thread manager. */ void cdb_checkpoint(void) { int ret; -// static time_t last_run = 0L; - - /* Only do a checkpoint once per minute. */ -/* - * Don't need this any more, since the thread that calls us sleeps for 60 seconds between calls - - if ((time(NULL) - last_run) < 60L) { - return; - } - last_run = time(NULL); -*/ CtdlLogPrintf(CTDL_DEBUG, "-- db checkpoint --\n"); ret = dbenv->txn_checkpoint(dbenv, @@ -270,7 +259,7 @@ void open_databases(void) { int ret; int i; - char dbfilename[SIZ]; + char dbfilename[32]; u_int32_t flags = 0; int dbversion_major, dbversion_minor, dbversion_patch; int current_dbversion = 0; diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c index cfafb7f28..fe97f7812 100644 --- a/citadel/modules/calendar/serv_calendar.c +++ b/citadel/modules/calendar/serv_calendar.c @@ -872,7 +872,7 @@ int ical_conflicts_phase6(struct icaltimetype t1start, { int conflict_reported = 0; - /* debugging cruft * + /* debugging cruft */ time_t tt; tt = icaltime_as_timet(t1start); CtdlLogPrintf(CTDL_DEBUG, "PROPOSED START: %s", ctime(&tt)); @@ -882,7 +882,7 @@ int ical_conflicts_phase6(struct icaltimetype t1start, CtdlLogPrintf(CTDL_DEBUG, "EXISTING START: %s", ctime(&tt)); tt = icaltime_as_timet(t2end); CtdlLogPrintf(CTDL_DEBUG, " EXISTING END: %s", ctime(&tt)); - * debugging cruft */ + /* debugging cruft */ /* compare and output */ -- 2.30.2