if necessary
note that "len" is the minimum length needed for the db
*/
-static int tdb_oob(struct tdb_context *tdb, tdb_off_t len, bool probe)
+static enum TDB_ERROR tdb_oob(struct tdb_context *tdb, tdb_off_t len,
+ bool probe)
{
struct stat st;
enum TDB_ERROR ecode;
(long long)len,
(long long)tdb->map_size);
}
- return -1;
+ return TDB_ERR_IO;
}
ecode = tdb_lock_expand(tdb, F_RDLCK);
if (ecode != TDB_SUCCESS) {
- tdb->ecode = ecode;
- return -1;
+ return ecode;
}
if (fstat(tdb->fd, &st) != 0) {
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"Failed to fstat file: %s", strerror(errno));
tdb_unlock_expand(tdb, F_RDLCK);
- return -1;
+ return TDB_ERR_IO;
}
tdb_unlock_expand(tdb, F_RDLCK);
"tdb_oob len %zu beyond eof at %zu",
(size_t)len, st.st_size);
}
- return -1;
+ return TDB_ERR_IO;
}
/* Unmap, update size, remap */
tdb->map_size = st.st_size;
tdb_mmap(tdb);
- return 0;
+ return TDB_SUCCESS;
}
/* Endian conversion: we only ever deal with 8 byte quantities */
{
char buf[8192] = { 0 };
void *p = tdb->methods->direct(tdb, off, len, true);
+ enum TDB_ERROR ecode;
assert(!tdb->read_only);
if (p) {
}
while (len) {
unsigned todo = len < sizeof(buf) ? len : sizeof(buf);
- if (tdb->methods->twrite(tdb, off, buf, todo) == -1)
+ ecode = tdb->methods->twrite(tdb, off, buf, todo);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
return -1;
+ }
len -= todo;
off += todo;
}
}
/* write a lump of data at a specified offset */
-static int tdb_write(struct tdb_context *tdb, tdb_off_t off,
- const void *buf, tdb_len_t len)
+static enum TDB_ERROR tdb_write(struct tdb_context *tdb, tdb_off_t off,
+ const void *buf, tdb_len_t len)
{
+ enum TDB_ERROR ecode;
+
if (tdb->read_only) {
- tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
- "Write to read-only database");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
+ "Write to read-only database");
}
/* FIXME: Bogus optimization? */
if (len == 0) {
- return 0;
+ return TDB_SUCCESS;
}
- if (tdb->methods->oob(tdb, off + len, 0) != 0)
- return -1;
+ ecode = tdb->methods->oob(tdb, off + len, 0);
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
+ }
if (tdb->map_ptr) {
memcpy(off + (char *)tdb->map_ptr, buf, len);
if (ret >= 0)
errno = ENOSPC;
- tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
- "tdb_write: %zi at %zu len=%zu (%s)",
- ret, (size_t)off, (size_t)len,
- strerror(errno));
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb_write: %zi at %zu len=%zu (%s)",
+ ret, (size_t)off, (size_t)len,
+ strerror(errno));
}
}
- return 0;
+ return TDB_SUCCESS;
}
/* read a lump of data at a specified offset */
-static int tdb_read(struct tdb_context *tdb, tdb_off_t off, void *buf,
- tdb_len_t len)
+static enum TDB_ERROR tdb_read(struct tdb_context *tdb, tdb_off_t off,
+ void *buf, tdb_len_t len)
{
- if (tdb->methods->oob(tdb, off + len, 0) != 0) {
- return -1;
+ enum TDB_ERROR ecode;
+
+ ecode = tdb->methods->oob(tdb, off + len, 0);
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
}
if (tdb->map_ptr) {
} else {
ssize_t r = pread(tdb->fd, buf, len, off);
if (r != len) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
- "tdb_read failed with %zi at %zu "
- "len=%zu (%s) map_size=%zu",
- r, (size_t)off, (size_t)len,
- strerror(errno),
- (size_t)tdb->map_size);
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb_read failed with %zi at %zu "
+ "len=%zu (%s) map_size=%zu",
+ r, (size_t)off, (size_t)len,
+ strerror(errno),
+ (size_t)tdb->map_size);
}
}
- return 0;
+ return TDB_SUCCESS;
}
int tdb_write_convert(struct tdb_context *tdb, tdb_off_t off,
const void *rec, size_t len)
{
- int ret;
+ enum TDB_ERROR ecode;
+
if (unlikely((tdb->flags & TDB_CONVERT))) {
void *conv = malloc(len);
if (!conv) {
return -1;
}
memcpy(conv, rec, len);
- ret = tdb->methods->twrite(tdb, off,
+ ecode = tdb->methods->twrite(tdb, off,
tdb_convert(tdb, conv, len), len);
free(conv);
- } else
- ret = tdb->methods->twrite(tdb, off, rec, len);
+ } else {
+ ecode = tdb->methods->twrite(tdb, off, rec, len);
+ }
- return ret;
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
+ return -1;
+ }
+ return 0;
}
int tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
void *rec, size_t len)
{
- int ret = tdb->methods->tread(tdb, off, rec, len);
+ enum TDB_ERROR ecode = tdb->methods->tread(tdb, off, rec, len);
tdb_convert(tdb, rec, len);
- return ret;
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
+ return -1;
+ }
+ return 0;
}
int tdb_write_off(struct tdb_context *tdb, tdb_off_t off, tdb_off_t val)
tdb_len_t len, unsigned int prefix)
{
void *buf;
+ enum TDB_ERROR ecode;
/* some systems don't like zero length malloc */
buf = malloc(prefix + len ? prefix + len : 1);
tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_USE_ERROR,
"tdb_alloc_read malloc failed len=%zu",
(size_t)(prefix + len));
- } else if (unlikely(tdb->methods->tread(tdb, offset, buf+prefix, len)
- == -1)) {
- free(buf);
- buf = NULL;
+ } else {
+ ecode = tdb->methods->tread(tdb, offset, buf+prefix, len);
+ if (unlikely(ecode != TDB_SUCCESS)) {
+ tdb->ecode = ecode;
+ free(buf);
+ buf = NULL;
+ }
}
return buf;
}
/* expand a file. we prefer to use ftruncate, as that is what posix
says to use for mmap expansion */
-static int tdb_expand_file(struct tdb_context *tdb, tdb_len_t addition)
+static enum TDB_ERROR tdb_expand_file(struct tdb_context *tdb,
+ tdb_len_t addition)
{
char buf[8192];
if (tdb->read_only) {
- tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
- "Expand on read-only database");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
+ "Expand on read-only database");
}
if (tdb->flags & TDB_INTERNAL) {
char *new = realloc(tdb->map_ptr, tdb->map_size + addition);
if (!new) {
- tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
- "No memory to expand database");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+ "No memory to expand database");
}
tdb->map_ptr = new;
tdb->map_size += addition;
disk. This must be done with write, not via mmap */
memset(buf, 0x43, sizeof(buf));
if (fill(tdb, buf, sizeof(buf), tdb->map_size, addition) == -1)
- return -1;
+ return tdb->ecode;
tdb->map_size += addition;
tdb_mmap(tdb);
}
- return 0;
+ return TDB_SUCCESS;
}
const void *tdb_access_read(struct tdb_context *tdb,
if (unlikely(!tdb->map_ptr))
return NULL;
- if (unlikely(tdb_oob(tdb, off + len, true) == -1))
+ if (unlikely(tdb_oob(tdb, off + len, true) != TDB_SUCCESS))
return NULL;
return (char *)tdb->map_ptr + off;
}
projects / ccan / blobdiff