/*
- * $Id: dbif.c,v 1.18 2009-12-20 16:04:21 franklahm Exp $
- *
* Copyright (C) Joerg Lenneis 2003
* Copyright (C) Frank Lahm 2009
* All Rights Reserved. See COPYING.
static char *old_dbfiles[] = {"cnid.db", NULL};
/* --------------- */
-static int upgrade_required(void)
+static int upgrade_required(const DBD *dbd)
{
int i;
+ int cwd = -1;
+ int ret = 0;
int found = 0;
struct stat st;
+ if ( ! dbd->db_filename)
+ /* in memory db */
+ return 0;
+
+ /* Remember cwd */
+ if ((cwd = open(".", O_RDONLY)) < 0) {
+ LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+ return -1;
+ }
+
+ /* chdir to db_envhome */
+ if ((chdir(dbd->db_envhome)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
+ ret = -1;
+ goto exit;
+ }
+
for (i = 0; old_dbfiles[i] != NULL; i++) {
if ( !(stat(old_dbfiles[i], &st) < 0) ) {
found++;
found++;
}
}
- return found;
+
+exit:
+ if (cwd != -1) {
+ if ((fchdir(cwd)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
+ ret = -1;
+ }
+ close(cwd);
+ }
+ return (ret < 0 ? ret : found);
+}
+
+/*!
+ * Upgrade CNID database versions
+ *
+ * For now this does nothing, as upgrading from ver. 0 to 1 is done in dbif_open
+ */
+static int dbif_upgrade(DBD *dbd)
+{
+ int version;
+
+ if ((version = dbif_getversion(dbd)) == -1)
+ return -1;
+
+ /*
+ * Do upgrade stuff ...
+ */
+
+ /* Write current version to database */
+ if (version != CNID_VERSION) {
+ if (dbif_setversion(dbd, CNID_VERSION) != 0)
+ return -1;
+ }
+
+ LOG(log_debug, logtype_cnid, "Finished CNID database version upgrade check");
+
+ return 0;
+}
+
+/* --------------- */
+static int dbif_openlog(DBD *dbd)
+{
+ int ret = 0;
+ int cwd = -1;
+
+ if ( ! dbd->db_filename)
+ /* in memory db */
+ return 0;
+
+ /* Remember cwd */
+ if ((cwd = open(".", O_RDONLY)) < 0) {
+ LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+ return -1;
+ }
+
+ /* chdir to db_envhome */
+ if ((chdir(dbd->db_envhome)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
+ ret = -1;
+ goto exit;
+ }
+
+ if ((dbd->db_errlog = fopen(DB_ERRLOGFILE, "a")) == NULL)
+ LOG(log_warning, logtype_cnid, "error creating/opening DB errlogfile: %s", strerror(errno));
+
+ if (dbd->db_errlog != NULL) {
+ dbd->db_env->set_errfile(dbd->db_env, dbd->db_errlog);
+ dbd->db_env->set_msgfile(dbd->db_env, dbd->db_errlog);
+ }
+
+exit:
+ if (cwd != -1) {
+ if ((fchdir(cwd)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
+ ret = -1;
+ }
+ close(cwd);
+ }
+ return ret;
+}
+
+/* --------------- */
+static int dbif_logautorem(DBD *dbd)
+{
+ int ret = 0;
+ int cwd = -1;
+ char **logfiles = NULL;
+ char **file;
+
+ if ( ! dbd->db_filename)
+ /* in memory db */
+ return 0;
+
+ /* Remember cwd */
+ if ((cwd = open(".", O_RDONLY)) < 0) {
+ LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+ return -1;
+ }
+
+ /* chdir to db_envhome */
+ if ((chdir(dbd->db_envhome)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
+ ret = -1;
+ goto exit;
+ }
+
+ if ((ret = dbd->db_env->log_archive(dbd->db_env, &logfiles, 0)) != 0) {
+ LOG(log_error, logtype_cnid, "error getting list of stale logfiles: %s",
+ db_strerror(ret));
+ dbd->db_env->close(dbd->db_env, 0);
+ dbd->db_env = NULL;
+ ret = -1;
+ goto exit;
+ }
+
+ if (logfiles != NULL) {
+ for (file = logfiles; *file != NULL; file++) {
+ if (unlink(*file) < 0)
+ LOG(log_warning, logtype_cnid, "Error removing stale logfile %s: %s", *file, strerror(errno));
+ }
+ free(logfiles);
+ }
+
+exit:
+ if (cwd != -1) {
+ if ((fchdir(cwd)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
+ ret = -1;
+ }
+ close(cwd);
+ }
+ return ret;
}
/* --------------- */
}
if ((rc = stat(dbd->db_table[DBIF_CNID].name, &st)) < 0) {
- LOG(log_error, logtype_cnid, "error stating database %s: %s", dbd->db_table[DBIF_CNID].name, db_strerror(rc));
+ LOG(log_error, logtype_cnid, "error stating database %s: %s", dbd->db_table[DBIF_CNID].name, db_strerror(errno));
return -1;
}
memset(buffer, 0, size);
dbd->db_table[DBIF_CNID].name = "cnid2.db";
dbd->db_table[DBIF_IDX_DEVINO].name = "devino.db";
dbd->db_table[DBIF_IDX_DIDNAME].name = "didname.db";
+ dbd->db_table[DBIF_IDX_NAME].name = "name.db";
dbd->db_table[DBIF_CNID].type = DB_BTREE;
dbd->db_table[DBIF_IDX_DEVINO].type = DB_BTREE;
dbd->db_table[DBIF_IDX_DIDNAME].type = DB_BTREE;
+ dbd->db_table[DBIF_IDX_NAME].type = DB_BTREE;
dbd->db_table[DBIF_CNID].openflags = DB_CREATE;
dbd->db_table[DBIF_IDX_DEVINO].openflags = DB_CREATE;
dbd->db_table[DBIF_IDX_DIDNAME].openflags = DB_CREATE;
+ dbd->db_table[DBIF_IDX_NAME].openflags = DB_CREATE;
+
+ dbd->db_table[DBIF_IDX_NAME].flags = DB_DUPSORT;
return dbd;
}
*/
int dbif_env_open(DBD *dbd, struct db_param *dbp, uint32_t dbenv_oflags)
{
- int ret, cwd;
- char **logfiles = NULL;
- char **file;
-
- /* Remember cwd */
- if ((cwd = open(".", O_RDONLY)) < 0) {
- LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
- return -1;
- }
-
- /* chdir to db_envhome. makes it easier checking for old db files and creating db_errlog file */
- if ((chdir(dbd->db_envhome)) != 0) {
- LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
- return -1;
- }
+ int ret;
/* Refuse to do anything if this is an old version of the CNID database */
- if (upgrade_required()) {
+ if (upgrade_required(dbd)) {
LOG(log_error, logtype_cnid, "Found version 1 of the CNID database. Please upgrade to version 2");
return -1;
}
- if ((dbd->db_errlog = fopen(DB_ERRLOGFILE, "a")) == NULL)
- LOG(log_warning, logtype_cnid, "error creating/opening DB errlogfile: %s", strerror(errno));
-
- if ((fchdir(cwd)) != 0) {
- LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
- return -1;
- }
-
if ((ret = db_env_create(&dbd->db_env, 0))) {
LOG(log_error, logtype_cnid, "error creating DB environment: %s",
db_strerror(ret));
return -1;
}
- if (dbd->db_errlog != NULL) {
- dbd->db_env->set_errfile(dbd->db_env, dbd->db_errlog);
- dbd->db_env->set_msgfile(dbd->db_env, dbd->db_errlog);
- }
+ if ((dbif_openlog(dbd)) != 0)
+ return -1;
if (dbenv_oflags & DB_RECOVER) {
+
+ LOG(log_debug, logtype_cnid, "Running recovery");
+
dbd->db_env->set_verbose(dbd->db_env, DB_VERB_RECOVERY, 1);
/* Open the database for recovery using DB_PRIVATE option which is faster */
if ((ret = dbd->db_env->open(dbd->db_env, dbd->db_envhome, dbenv_oflags | DB_PRIVATE, 0))) {
dbd->db_env = NULL;
return -1;
}
+ dbd->db_errlog = NULL;
if ((ret = db_env_create(&dbd->db_env, 0))) {
LOG(log_error, logtype_cnid, "error creating DB environment after recovery: %s",
dbd->db_env = NULL;
return -1;
}
+
+ if ((dbif_openlog(dbd)) != 0)
+ return -1;
+
+ LOG(log_debug, logtype_cnid, "Finished recovery.");
}
if ((ret = dbd->db_env->set_cachesize(dbd->db_env, 0, 1024 * dbp->cachesize, 0))) {
return -1;
}
- if (dbd->db_errlog != NULL) {
- dbd->db_env->set_errfile(dbd->db_env, dbd->db_errlog);
- dbd->db_env->set_msgfile(dbd->db_env, dbd->db_errlog);
- }
if ((ret = dbd->db_env->open(dbd->db_env, dbd->db_envhome, dbenv_oflags, 0))) {
LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s",
db_strerror(ret));
}
if (dbp->logfile_autoremove) {
- if (dbd->db_env->log_archive(dbd->db_env, &logfiles, 0)) {
- LOG(log_error, logtype_cnid, "error getting list of stale logfiles: %s",
- db_strerror(ret));
- dbd->db_env->close(dbd->db_env, 0);
- dbd->db_env = NULL;
+ if ((dbif_logautorem(dbd)) != 0)
return -1;
- }
- if (logfiles != NULL) {
- /* Remember cwd */
- if ((cwd = open(".", O_RDONLY)) < 0) {
- LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
- goto logfiles_done;
- }
- /* chdir to db_envhome */
- if ((chdir(dbd->db_envhome)) != 0) {
- LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
- goto logfiles_done;
- }
-
- for (file = logfiles; *file != NULL; file++) {
- if (unlink(*file) < 0)
- LOG(log_warning, logtype_cnid, "Error removing stale logfile %s: %s", *file, strerror(errno));
- }
-
- /* chdir back */
- if ((fchdir(cwd)) != 0) {
- LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
- return -1;
- }
-
- logfiles_done:
- free(logfiles);
- }
#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 7)
if ((ret = dbd->db_env->log_set_config(dbd->db_env, DB_LOG_AUTO_REMOVE, 1))) {
}
/* --------------- */
-int dbif_open(DBD *dbd, struct db_param *dbp _U_, int reindex)
+int dbif_open(DBD *dbd, struct db_param *dbp, int reindex)
{
int ret, i, cwd;
u_int32_t count;
LOG(log_error, logtype_cnid, "error forcing checkpoint: %s", db_strerror(ret));
return -1;
}
- LOG(log_debug, logtype_cnid, "Finished CNID database upgrade check");
+ LOG(log_debug, logtype_cnid, "Finished BerkeleyBD upgrade check");
}
if ((fchdir(cwd)) != 0) {
}
}
+ if ( ! dbd->db_env) { /* In memory db */
+ if ((ret = dbd->db_table[i].db->set_cachesize(dbd->db_table[i].db,
+ 0,
+ dbp->cachesize,
+ 4)) /* split in 4 memory chunks */
+ < 0) {
+ LOG(log_error, logtype_cnid, "error setting cachesize %u KB for database %s: %s",
+ dbp->cachesize / 1024, dbd->db_table[i].name, db_strerror(ret));
+ return -1;
+ }
+ }
+
if (dbd->db_table[i].db->open(dbd->db_table[i].db,
dbd->db_txn,
dbd->db_filename,
LOG(log_error, logtype_cnid, "Cant open database");
return -1;
}
- if (dbd->db_errlog != NULL)
- dbd->db_table[i].db->set_errfile(dbd->db_table[i].db, dbd->db_errlog);
if (reindex && i > 0) {
LOG(log_info, logtype_cnid, "Truncating CNID index.");
}
if (reindex)
LOG(log_info, logtype_cnid, "... done.");
+
+ if (reindex)
+ LOG(log_info, logtype_cnid, "Reindexing name index...");
+ if ((ret = dbd->db_table[0].db->associate(dbd->db_table[0].db,
+ dbd->db_txn,
+ dbd->db_table[DBIF_IDX_NAME].db,
+ idxname,
+ (reindex
+ ||
+ ((CNID_VERSION == CNID_VERSION_1) && (dbif_getversion(dbd) == CNID_VERSION_0)))
+ ? DB_CREATE : 0)) != 0) {
+ LOG(log_error, logtype_cnid, "Failed to associate name index: %s", db_strerror(ret));
+ return -1;
+ }
+ if (reindex)
+ LOG(log_info, logtype_cnid, "... done.");
+
+ if ((ret = dbif_upgrade(dbd)) != 0) {
+ LOG(log_error, logtype_cnid, "Error upgrading CNID database to version %d", CNID_VERSION);
+ return -1;
+ }
return 0;
}
In order to support silent database upgrades:
destroy env at cnid_dbd shutdown.
*/
-int dbif_prep_upgrade(const char *path)
+int dbif_env_remove(const char *path)
{
- int cwd, ret;
+ int ret;
DBD *dbd;
LOG(log_debug, logtype_cnid, "Reopening BerkeleyDB environment");
if (NULL == (dbd = dbif_init(path, "cnid2.db")))
return -1;
- /* Remember cwd */
- if ((cwd = open(".", O_RDONLY)) < 0) {
- LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
- return -1;
- }
-
- /* chdir to db_envhome. makes it easier checking for old db files and creating db_errlog file */
- if ((chdir(dbd->db_envhome)) != 0) {
- LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
- return -1;
- }
-
- if ((dbd->db_errlog = fopen(DB_ERRLOGFILE, "a")) == NULL)
- LOG(log_warning, logtype_cnid, "error creating/opening DB errlogfile: %s", strerror(errno));
-
- if ((fchdir(cwd)) != 0) {
- LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
- return -1;
- }
-
/* Get db_env handle */
if ((ret = db_env_create(&dbd->db_env, 0))) {
LOG(log_error, logtype_cnid, "error creating DB environment: %s", db_strerror(ret));
return -1;
}
- /* Set logfile */
- if (dbd->db_errlog != NULL) {
- dbd->db_env->set_errfile(dbd->db_env, dbd->db_errlog);
- dbd->db_env->set_msgfile(dbd->db_env, dbd->db_errlog);
- dbd->db_env->set_verbose(dbd->db_env, DB_VERB_RECOVERY, 1);
- }
+ if ((dbif_openlog(dbd)) != 0)
+ return -1;
/* Open environment with recovery */
if ((ret = dbd->db_env->open(dbd->db_env,
return 0;
if (ret) {
LOG(log_error, logtype_cnid, "error retrieving value from %s: %s",
- dbd->db_table[dbi].name, db_strerror(errno));
+ dbd->db_table[dbi].name, db_strerror(ret));
return -1;
} else
return 1;
}
if (ret) {
LOG(log_error, logtype_cnid, "error retrieving value from %s: %s",
- dbd->db_table[dbi].name, db_strerror(errno));
+ dbd->db_table[dbi].name, db_strerror(ret));
return -1;
} else
return 1;
int ret;
if (dbif_txn_begin(dbd) < 0) {
- LOG(log_error, logtype_cnid, "error setting key/value in %s: %s",
- dbd->db_table[dbi].name, db_strerror(errno));
+ LOG(log_error, logtype_cnid, "error setting key/value in %s", dbd->db_table[dbi].name);
return -1;
}
key,
val,
flags);
+
if (ret) {
if ((flags & DB_NOOVERWRITE) && ret == DB_KEYEXIST) {
return 1;
} else {
LOG(log_error, logtype_cnid, "error setting key/value in %s: %s",
- dbd->db_table[dbi].name, db_strerror(errno));
+ dbd->db_table[dbi].name, db_strerror(ret));
return -1;
}
} else
}
if (dbif_txn_begin(dbd) < 0) {
- LOG(log_error, logtype_cnid, "error deleting key/value from %s: %s",
- dbd->db_table[dbi].name, db_strerror(errno));
+ LOG(log_error, logtype_cnid, "error deleting key/value from %s", dbd->db_table[dbi].name);
return -1;
}
return 0;
if (ret) {
LOG(log_error, logtype_cnid, "error deleting key/value from %s: %s",
- dbd->db_table[dbi].name, db_strerror(errno));
+ dbd->db_table[dbi].name, db_strerror(ret));
return -1;
} else
return 1;
}
+/*!
+ * Return CNID database version number
+ * @returns -1 on error, version number otherwise
+ */
+int dbif_getversion(DBD *dbd)
+{
+ DBT key, data;
+ uint32_t version;
+ int ret;
+
+ memset(&key, 0, sizeof(key));
+ memset(&data, 0, sizeof(data));
+ key.data = ROOTINFO_KEY;
+ key.size = ROOTINFO_KEYLEN;
+
+ switch (dbif_get(dbd, DBIF_CNID, &key, &data, 0)) {
+ case 1:
+ memcpy(&version, (char *)data.data + CNID_DID_OFS, sizeof(version));
+ version = ntohl(version);
+ LOG(log_debug, logtype_cnid, "CNID database version %u", version);
+ ret = version;
+ break;
+ default:
+ ret = -1;
+ break;
+ }
+ return ret;
+}
+
+/*!
+ * Return CNID database version number
+ * @returns -1 on error, version number otherwise
+ */
+int dbif_setversion(DBD *dbd, int version)
+{
+ DBT key, data;
+ uint32_t v;
+
+ v = version;
+ v = htonl(v);
+
+ memset(&key, 0, sizeof(key));
+ memset(&data, 0, sizeof(data));
+ key.data = ROOTINFO_KEY;
+ key.size = ROOTINFO_KEYLEN;
+
+ switch (dbif_get(dbd, DBIF_CNID, &key, &data, 0)) {
+ case 1:
+ break;
+ default:
+ return -1;
+ }
+
+ memcpy((char *)data.data + CNID_DID_OFS, &v, sizeof(v));
+ data.size = ROOTINFO_DATALEN;
+ if (dbif_put(dbd, DBIF_CNID, &key, &data, 0) < 0)
+ return -1;
+
+ return 0;
+}
+
+/*!
+ * Search the database by name
+ *
+ * @param resbuf (w) buffer for search results CNIDs, maxsize is assumed to be
+ * DBD_MAX_SRCH_RSLTS * sizefof(cnid_t)
+ *
+ * @returns -1 on error, 0 when nothing found, else the number of matches
+ */
+int dbif_search(DBD *dbd, DBT *key, char *resbuf)
+{
+ int ret = 0;
+ int count = 0;
+ DBC *cursorp = NULL;
+ DBT pkey, data;
+ char *cnids = resbuf;
+ cnid_t cnid;
+ char *namebkp = key->data;
+ int namelenbkp = key->size;
+
+ memset(&pkey, 0, sizeof(DBT));
+ memset(&data, 0, sizeof(DBT));
+
+ /* Get a cursor */
+ ret = dbd->db_table[DBIF_IDX_NAME].db->cursor(dbd->db_table[DBIF_IDX_NAME].db,
+ NULL,
+ &cursorp,
+ 0);
+ if (ret != 0) {
+ LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(ret));
+ ret = -1;
+ goto exit;
+ }
+
+ ret = cursorp->pget(cursorp, key, &pkey, &data, DB_SET_RANGE);
+ while (count < DBD_MAX_SRCH_RSLTS && ret != DB_NOTFOUND) {
+ if (namelenbkp <= key->size && strncmp(namebkp, key->data, namelenbkp) == 0) {
+ count++;
+ memcpy(cnids, pkey.data, sizeof(cnid_t));
+ memcpy(&cnid, pkey.data, sizeof(cnid_t));
+ cnids += sizeof(cnid_t);
+ LOG(log_error, logtype_cnid, "match: CNID %" PRIu32, ntohl(cnid));
+ } else {
+ LOG(log_error, logtype_cnid, "ignoring: CNID %" PRIu32, ntohl(cnid));
+ }
+ ret = cursorp->pget(cursorp, key, &pkey, &data, DB_NEXT);
+ }
+
+ ret = count;
+
+exit:
+ if (cursorp != NULL)
+ cursorp->close(cursorp);
+ return ret;
+}
+
int dbif_txn_begin(DBD *dbd)
{
int ret;
ret = dbd->db_env->txn_begin(dbd->db_env, NULL, &dbd->db_txn, 0);
if (ret) {
- LOG(log_error, logtype_cnid, "error starting transaction: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "error starting transaction: %s", db_strerror(ret));
return -1;
} else
return 0;
dbd->db_txn = NULL;
if (ret) {
- LOG(log_error, logtype_cnid, "error committing transaction: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "error committing transaction: %s", db_strerror(ret));
return -1;
} else
return 1;
dbd->db_txn = NULL;
if (ret) {
- LOG(log_error, logtype_cnid, "error aborting transaction: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "error aborting transaction: %s", db_strerror(ret));
return -1;
} else
return 0;
int ret;
ret = dbd->db_env->txn_checkpoint(dbd->db_env, kbyte, min, flags);
if (ret) {
- LOG(log_error, logtype_cnid, "error checkpointing transaction susystem: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "error checkpointing transaction susystem: %s", db_strerror(ret));
return -1;
} else
return 0;
ret = db->stat(db, NULL, &sp, 0);
if (ret) {
- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(ret));
return -1;
}
rc = db->cursor(db, NULL, &cur, 0);
if (rc) {
- LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(rc));
return -1;
}
}
if (rc != DB_NOTFOUND) {
- LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(rc));
return -1;
}
rc = cur->c_close(cur);
if (rc) {
- LOG(log_error, logtype_cnid, "Couldn't close cursor: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Couldn't close cursor: %s", db_strerror(rc));
return -1;
}
printf("%u CNIDs in database. Max CNID: %u.\n", count, max);
db = dbd->db_table[DBIF_IDX_DEVINO].db;
rc = db->cursor(db, NULL, &cur, 0);
if (rc) {
- LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(rc));
return -1;
}
rc = cur->c_get(cur, &key, &data, DB_NEXT);
}
if (rc != DB_NOTFOUND) {
- LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(rc));
return -1;
}
rc = cur->c_close(cur);
if (rc) {
- LOG(log_error, logtype_cnid, "Couldn't close cursor: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Couldn't close cursor: %s", db_strerror(rc));
return -1;
}
printf("%u items\n", count);
db = dbd->db_table[DBIF_IDX_DIDNAME].db;
rc = db->cursor(db, NULL, &cur, 0);
if (rc) {
- LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(rc));
return -1;
}
rc = cur->c_get(cur, &key, &data, DB_NEXT);
}
if (rc != DB_NOTFOUND) {
- LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(rc));
return -1;
}
rc = cur->c_close(cur);
if (rc) {
- LOG(log_error, logtype_cnid, "Couldn't close cursor: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Couldn't close cursor: %s", db_strerror(rc));
return -1;
}
printf("%u items\n", count);
static DBT key = { 0 }, data = { 0 };
DB *db = dbd->db_table[DBIF_CNID].db;
- if (close && dbd->db_cur) {
- dbd->db_cur->close(dbd->db_cur);
- dbd->db_cur = NULL;
+ if (close) {
+ if (dbd->db_cur) {
+ dbd->db_cur->close(dbd->db_cur);
+ dbd->db_cur = NULL;
+ }
return 0;
}
/* An dbif_del will have closed our cursor too */
if ( ! dbd->db_cur ) {
- if (db->cursor(db, NULL, &dbd->db_cur, 0) != 0) {
- LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(errno));
+ if ((rc = db->cursor(db, NULL, &dbd->db_cur, 0)) != 0) {
+ LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(rc));
return -1;
}
flag = DB_SET_RANGE; /* This will seek to next cnid after the one just deleted */
}
if (rc != DB_NOTFOUND) {
- LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(errno));
+ LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(rc));
dbd->db_cur->close(dbd->db_cur);
dbd->db_cur = NULL;
return -1;
projects / netatalk.git / blobdiff