if (tdb->methods->tdb1_read(tdb, 0, &hdr, sizeof(hdr), 0) == -1)
return false;
- if (strcmp(hdr.magic_food, TDB1_MAGIC_FOOD) != 0)
+ if (strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0)
goto corrupt;
TDB1_CONV(hdr);
return true;
corrupt:
- tdb->ecode = TDB1_ERR_CORRUPT;
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "Header is corrupt\n"));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Header is corrupt\n");
return false;
}
/* Check rec->next: 0 or points to record offset, aligned. */
if (rec->next > 0 && rec->next < TDB1_DATA_START(tdb->header.hash_size)){
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Record offset %d too small next %d\n",
- off, rec->next));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Record offset %d too small next %d\n",
+ off, rec->next);
goto corrupt;
}
if (rec->next + sizeof(*rec) < rec->next) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Record offset %d too large next %d\n",
- off, rec->next));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Record offset %d too large next %d\n",
+ off, rec->next);
goto corrupt;
}
if ((rec->next % TDB1_ALIGNMENT) != 0) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Record offset %d misaligned next %d\n",
- off, rec->next));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Record offset %d misaligned next %d\n",
+ off, rec->next);
goto corrupt;
}
if (tdb->methods->tdb1_oob(tdb, rec->next+sizeof(*rec), 0))
/* Check rec_len: similar to rec->next, implies next record. */
if ((rec->rec_len % TDB1_ALIGNMENT) != 0) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Record offset %d misaligned length %d\n",
- off, rec->rec_len));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Record offset %d misaligned length %d\n",
+ off, rec->rec_len);
goto corrupt;
}
/* Must fit tailer. */
if (rec->rec_len < sizeof(tailer)) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Record offset %d too short length %d\n",
- off, rec->rec_len));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Record offset %d too short length %d\n",
+ off, rec->rec_len);
goto corrupt;
}
/* OOB allows "right at the end" access, so this works for last rec. */
&tailer) == -1)
goto corrupt;
if (tailer != sizeof(*rec) + rec->rec_len) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Record offset %d invalid tailer\n", off));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Record offset %d invalid tailer\n", off);
goto corrupt;
}
return true;
corrupt:
- tdb->ecode = TDB1_ERR_CORRUPT;
+ tdb->last_error = TDB_ERR_CORRUPT;
return false;
}
/* Grab some bytes: may copy if can't use mmap.
Caller has already done bounds check. */
-static TDB1_DATA get_bytes(struct tdb1_context *tdb,
+static TDB_DATA get_bytes(struct tdb1_context *tdb,
tdb1_off_t off, tdb1_len_t len)
{
- TDB1_DATA d;
+ TDB_DATA d;
d.dsize = len;
}
/* Frees data if we're not able to simply use mmap. */
-static void put_bytes(struct tdb1_context *tdb, TDB1_DATA d)
+static void put_bytes(struct tdb1_context *tdb, TDB_DATA d)
{
if (tdb->transaction == NULL && tdb->map_ptr != NULL)
return;
tdb1_off_t off,
const struct tdb1_record *rec,
unsigned char **hashes,
- int (*check)(TDB1_DATA, TDB1_DATA, void *),
+ int (*check)(TDB_DATA, TDB_DATA, void *),
void *private_data)
{
- TDB1_DATA key, data;
+ TDB_DATA key, data;
if (!tdb1_check_record(tdb, off, rec))
return false;
/* key + data + tailer must fit in record */
if (rec->key_len + rec->data_len + sizeof(tdb1_off_t) > rec->rec_len) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Record offset %d too short for contents\n", off));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Record offset %d too short for contents\n", off);
return false;
}
return false;
if (tdb->hash_fn(&key) != rec->full_hash) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Record offset %d has incorrect hash\n", off));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Record offset %d has incorrect hash\n", off);
goto fail_put_key;
}
return len;
}
-_PUBLIC_ int tdb1_check(struct tdb1_context *tdb,
- int (*check)(TDB1_DATA key, TDB1_DATA data, void *private_data),
+int tdb1_check(struct tdb1_context *tdb,
+ int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
void *private_data)
{
unsigned int h;
/* We should have the whole header, too. */
if (tdb->map_size < TDB1_DATA_START(tdb->header.hash_size)) {
- tdb->ecode = TDB1_ERR_CORRUPT;
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "File too short for hashes\n"));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "File too short for hashes\n");
goto unlock;
}
1, sizeof(hashes[0]) * (1+tdb->header.hash_size)
+ BITMAP_BITS / CHAR_BIT * (1+tdb->header.hash_size));
if (!hashes) {
- tdb->ecode = TDB1_ERR_OOM;
+ tdb->last_error = TDB_ERR_OOM;
goto unlock;
}
if (dead < sizeof(rec))
goto corrupt;
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Dead space at %d-%d (of %u)\n",
- off, off + dead, tdb->map_size));
+ tdb_logerr(tdb, TDB_SUCCESS, TDB_LOG_WARNING,
+ "Dead space at %d-%d (of %u)\n",
+ off, off + dead, tdb->map_size);
rec.rec_len = dead - sizeof(rec);
break;
case TDB1_RECOVERY_MAGIC:
if (recovery_start != off) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Unexpected recovery record at offset %d\n",
- off));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Unexpected recovery record at offset %d\n",
+ off);
goto free;
}
found_recovery = true;
break;
default: ;
corrupt:
- tdb->ecode = TDB1_ERR_CORRUPT;
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Bad magic 0x%x at offset %d\n",
- rec.magic, off));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Bad magic 0x%x at offset %d\n",
+ rec.magic, off);
goto free;
}
}
unsigned int i;
for (i = 0; i < BITMAP_BITS / CHAR_BIT; i++) {
if (hashes[h][i] != 0) {
- tdb->ecode = TDB1_ERR_CORRUPT;
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Hashes do not match records\n"));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Hashes do not match records\n");
goto free;
}
}
/* We must have found recovery area if there was one. */
if (recovery_start != 0 && !found_recovery) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "Expected a recovery area at %u\n",
- recovery_start));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "Expected a recovery area at %u\n",
+ recovery_start);
goto free;
}