- /*
+ /*
Unix SMB/CIFS implementation.
trivial database library
Copyright (C) Rusty Russell 2009
-
+
** NOTE! The following LGPL license applies to the tdb
** library. This does NOT imply that all of Samba is released
** under the LGPL
-
+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
/* Generic record header check. */
static bool tdb_check_record(struct tdb_context *tdb,
tdb_off_t off,
- const struct list_struct *rec)
+ const struct tdb_record *rec)
{
tdb_off_t tailer;
/* Check that an in-use record is valid. */
static bool tdb_check_used_record(struct tdb_context *tdb,
tdb_off_t off,
- const struct list_struct *rec,
+ const struct tdb_record *rec,
unsigned char **hashes,
int (*check)(TDB_DATA, TDB_DATA, void *),
- void *private)
+ void *private_data)
{
TDB_DATA key, data;
if (!data.dptr)
goto fail_put_key;
- if (check(key, data, private) == -1)
+ if (check(key, data, private_data) == -1)
goto fail_put_data;
put_bytes(tdb, data);
}
/* Check that an unused record is valid. */
static bool tdb_check_free_record(struct tdb_context *tdb,
tdb_off_t off,
- const struct list_struct *rec,
+ const struct tdb_record *rec,
unsigned char **hashes)
{
if (!tdb_check_record(tdb, off, rec))
}
int tdb_check(struct tdb_context *tdb,
- int (*check)(TDB_DATA key, TDB_DATA data, void *private),
- void *private)
+ int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
+ void *private_data)
{
unsigned int h;
unsigned char **hashes;
tdb_off_t off, recovery_start;
- struct list_struct rec;
+ struct tdb_record rec;
bool found_recovery = false;
if (tdb_lockall(tdb) == -1)
}
/* One big malloc: pointers then bit arrays. */
- hashes = calloc(1, sizeof(hashes[0]) * (1+tdb->header.hash_size)
+ hashes = (unsigned char **)calloc(
+ 1, sizeof(hashes[0]) * (1+tdb->header.hash_size)
+ BITMAP_BITS / CHAR_BIT * (1+tdb->header.hash_size));
if (!hashes) {
tdb->ecode = TDB_ERR_OOM;
case TDB_MAGIC:
case TDB_DEAD_MAGIC:
if (!tdb_check_used_record(tdb, off, &rec, hashes,
- check, private))
+ check, private_data))
goto free;
break;
case TDB_FREE_MAGIC:
goto free;
break;
case TDB_RECOVERY_MAGIC:
- case 0: /* Used for invalid (or in-progress) recovery area. */
+ case TDB_RECOVERY_INVALID_MAGIC:
if (recovery_start != off) {
TDB_LOG((tdb, TDB_DEBUG_ERROR,
"Unexpected recovery record at offset %d\n",