projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8716d42
)
* When we get a Berkeley DB panic, display a descriptive Berkeley DB error message...
author
Art Cancro
<ajc@citadel.org>
Thu, 16 Apr 2009 21:10:54 +0000
(21:10 +0000)
committer
Art Cancro
<ajc@citadel.org>
Thu, 16 Apr 2009 21:10:54 +0000
(21:10 +0000)
citadel/database.c
patch
|
blob
|
history
diff --git
a/citadel/database.c
b/citadel/database.c
index 2101e4899900d5c68134ad4e9f44a7584cc9f963..bcb41422ffb00c48a206c463ba363dfb25540627 100644
(file)
--- a/
citadel/database.c
+++ b/
citadel/database.c
@@
-104,8
+104,7
@@
static void txcommit(DB_TXN * tid)
ret = tid->commit(tid, 0);
if (ret) {
ret = tid->commit(tid, 0);
if (ret) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_*: txn_commit: %s\n",
- db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "cdb_*: txn_commit: %s\n", db_strerror(ret));
abort();
}
}
abort();
}
}
@@
-118,15
+117,14
@@
static void txbegin(DB_TXN ** tid)
ret = dbenv->txn_begin(dbenv, NULL, tid, 0);
if (ret) {
ret = dbenv->txn_begin(dbenv, NULL, tid, 0);
if (ret) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_*: txn_begin: %s\n",
- db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "cdb_*: txn_begin: %s\n", db_strerror(ret));
abort();
}
}
static void dbpanic(DB_ENV * env, int errval)
{
abort();
}
}
static void dbpanic(DB_ENV * env, int errval)
{
- CtdlLogPrintf(CTDL_EMERG, "cdb_*: Berkeley DB panic: %
d\n", errval
);
+ CtdlLogPrintf(CTDL_EMERG, "cdb_*: Berkeley DB panic: %
s\n", db_strerror(errval)
);
}
static void cclose(DBC * cursor)
}
static void cclose(DBC * cursor)
@@
-134,8
+132,7
@@
static void cclose(DBC * cursor)
int ret;
if ((ret = cursor->c_close(cursor))) {
int ret;
if ((ret = cursor->c_close(cursor))) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_*: c_close: %s\n",
- db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "cdb_*: c_close: %s\n", db_strerror(ret));
abort();
}
}
abort();
}
}
@@
-147,8
+144,7
@@
static void bailIfCursor(DBC ** cursors, const char *msg)
for (i = 0; i < MAXCDB; i++)
if (cursors[i] != NULL) {
CtdlLogPrintf(CTDL_EMERG,
for (i = 0; i < MAXCDB; i++)
if (cursors[i] != NULL) {
CtdlLogPrintf(CTDL_EMERG,
- "cdb_*: cursor still in progress on cdb %02x: %s\n",
- i, msg);
+ "cdb_*: cursor still in progress on cdb %02x: %s\n", i, msg);
abort();
}
}
abort();
}
}
@@
-231,13
+227,10
@@
void cdb_checkpoint(void)
int ret;
CtdlLogPrintf(CTDL_DEBUG, "-- db checkpoint --\n");
int ret;
CtdlLogPrintf(CTDL_DEBUG, "-- db checkpoint --\n");
- ret = dbenv->txn_checkpoint(dbenv,
- MAX_CHECKPOINT_KBYTES,
- MAX_CHECKPOINT_MINUTES, 0);
+ ret = dbenv->txn_checkpoint(dbenv, MAX_CHECKPOINT_KBYTES, MAX_CHECKPOINT_MINUTES, 0);
if (ret != 0) {
if (ret != 0) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_checkpoint: txn_checkpoint: %s\n",
- db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "cdb_checkpoint: txn_checkpoint: %s\n", db_strerror(ret));
abort();
}
abort();
}