ret = tid->abort(tid);
if (ret) {
- CtdlLogPrintf(CTDL_EMERG, "bdb(): txn_abort: %s\n",
- db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "bdb(): txn_abort: %s\n", db_strerror(ret));
abort();
}
}
bailIfCursor(tsd->cursors, "in check_handles");
if (tsd->tid != NULL) {
- CtdlLogPrintf(CTDL_EMERG,
- "bdb(): transaction still in progress!");
+ CtdlLogPrintf(CTDL_EMERG, "bdb(): transaction still in progress!");
abort();
}
}
NULL,
DB_BTREE,
DB_CREATE | DB_AUTO_COMMIT | DB_THREAD,
- 0600);
+ 0600
+ );
if (ret) {
CtdlLogPrintf(CTDL_EMERG, "db_open[%02x]: %s\n", i, db_strerror(ret));
if (ret == ENOMEM) {
}
CtdlLogPrintf(CTDL_DEBUG, "open_databases() finished\n");
-
CtdlRegisterProtoHook(cmd_cull, "CULL", "Cull database logs");
}
CtdlLogPrintf(CTDL_INFO, "Closing database %02x\n", a);
ret = dbp[a]->close(dbp[a], 0);
if (ret) {
- CtdlLogPrintf(CTDL_EMERG,
- "db_close: %s\n", db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "db_close: %s\n", db_strerror(ret));
}
}
/* Close the handle. */
ret = dbenv->close(dbenv, 0);
if (ret) {
- CtdlLogPrintf(CTDL_EMERG,
- "DBENV->close: %s\n", db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "DBENV->close: %s\n", db_strerror(ret));
}
}
+ sizeof(struct CtdlCompressHeader);
destLen = (uLongf) buffer_len;
compressed_data = malloc(buffer_len);
- if (compress2((Bytef *) (compressed_data +
- sizeof(struct
- CtdlCompressHeader)),
- &destLen, (Bytef *) cdata, (uLongf) cdatalen,
- 1) != Z_OK) {
+ if (compress2((Bytef *) (compressed_data + sizeof(struct CtdlCompressHeader)),
+ &destLen, (Bytef *) cdata, (uLongf) cdatalen, 1) != Z_OK)
+ {
CtdlLogPrintf(CTDL_EMERG, "compress2() error\n");
abort();
}
zheader.compressed_len = (size_t) destLen;
- memcpy(compressed_data, &zheader,
- sizeof(struct CtdlCompressHeader));
- ddata.size = (size_t) (sizeof(struct CtdlCompressHeader) +
- zheader.compressed_len);
+ memcpy(compressed_data, &zheader, sizeof(struct CtdlCompressHeader));
+ ddata.size = (size_t) (sizeof(struct CtdlCompressHeader) + zheader.compressed_len);
ddata.data = compressed_data;
}
#endif
&ddata, /* data */
0); /* flags */
if (ret) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_store(%d): %s\n", cdb,
- db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "cdb_store(%d): %s\n", cdb, db_strerror(ret));
abort();
}
#ifdef HAVE_ZLIB
return ret;
} else {
- bailIfCursor(MYCURSORS,
- "attempt to write during r/o cursor");
+ bailIfCursor(MYCURSORS, "attempt to write during r/o cursor");
retry:
txbegin(&tid);
} else {
txcommit(tid);
#ifdef HAVE_ZLIB
- if (compressing)
+ if (compressing) {
free(compressed_data);
+ }
#endif
return ret;
}
if (MYTID != NULL) {
ret = dbp[cdb]->del(dbp[cdb], MYTID, &dkey, 0);
if (ret) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_delete(%d): %s\n", cdb,
- db_strerror(ret));
- if (ret != DB_NOTFOUND)
+ CtdlLogPrintf(CTDL_EMERG, "cdb_delete(%d): %s\n", cdb, db_strerror(ret));
+ if (ret != DB_NOTFOUND) {
abort();
+ }
}
} else {
- bailIfCursor(MYCURSORS,
- "attempt to delete during r/o cursor");
+ bailIfCursor(MYCURSORS, "attempt to delete during r/o cursor");
retry:
txbegin(&tid);
}
if ((ret != 0) && (ret != DB_NOTFOUND)) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_fetch(%d): %s\n", cdb,
- db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
abort();
}
tempcdb = (struct cdbdata *) malloc(sizeof(struct cdbdata));
if (tempcdb == NULL) {
- CtdlLogPrintf(CTDL_EMERG,
- "cdb_fetch: Cannot allocate memory for tempcdb\n");
+ CtdlLogPrintf(CTDL_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb\n");
abort();
}
void cdb_close_cursor(int cdb)
{
- if (MYCURSORS[cdb] != NULL)
+ if (MYCURSORS[cdb] != NULL) {
cclose(MYCURSORS[cdb]);
+ }
MYCURSORS[cdb] = NULL;
}
if (MYCURSORS[cdb] != NULL) {
CtdlLogPrintf(CTDL_EMERG,
- "cdb_rewind: must close cursor on database %d before reopening.\n",
- cdb);
+ "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
abort();
/* cclose(MYCURSORS[cdb]); */
}
*/
ret = dbp[cdb]->cursor(dbp[cdb], MYTID, &MYCURSORS[cdb], 0);
if (ret) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_rewind: db_cursor: %s\n",
- db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "cdb_rewind: db_cursor: %s\n", db_strerror(ret));
abort();
}
}
if (ret) {
if (ret != DB_NOTFOUND) {
- CtdlLogPrintf(CTDL_EMERG, "cdb_next_item(%d): %s\n",
- cdb, db_strerror(ret));
+ CtdlLogPrintf(CTDL_EMERG, "cdb_next_item(%d): %s\n", cdb, db_strerror(ret));
abort();
}
cclose(MYCURSORS[cdb]);
void cdb_begin_transaction(void)
{
- bailIfCursor(MYCURSORS,
- "can't begin transaction during r/o cursor");
+ bailIfCursor(MYCURSORS, "can't begin transaction during r/o cursor");
if (MYTID != NULL) {
- CtdlLogPrintf(CTDL_EMERG,
- "cdb_begin_transaction: ERROR: nested transaction\n");
+ CtdlLogPrintf(CTDL_EMERG, "cdb_begin_transaction: ERROR: nested transaction\n");
abort();
}
CtdlLogPrintf(CTDL_EMERG,
"cdb_end_transaction: ERROR: txcommit(NULL) !!\n");
abort();
- } else
+ } else {
txcommit(MYTID);
+ }
MYTID = NULL;
}
"cdb_trunc must not be called in a transaction.\n");
abort();
} else {
- bailIfCursor(MYCURSORS,
- "attempt to write during r/o cursor");
+ bailIfCursor(MYCURSORS, "attempt to write during r/o cursor");
retry:
/* txbegin(&tid); */