struct stat st;
if (len <= tdb->map_size)
return 0;
- if (tdb->flags & TDB1_INTERNAL) {
+ if (tdb->flags & TDB_INTERNAL) {
if (!probe) {
- /* Ensure ecode is set for log fn. */
- tdb->ecode = TDB1_ERR_IO;
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL,"tdb1_oob len %d beyond internal malloc size %d\n",
- (int)len, (int)tdb->map_size));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb1_oob len %d beyond internal malloc size %d",
+ (int)len, (int)tdb->map_size);
}
return -1;
}
if (fstat(tdb->fd, &st) == -1) {
- tdb->ecode = TDB1_ERR_IO;
+ tdb->last_error = TDB_ERR_IO;
return -1;
}
if (st.st_size < (size_t)len) {
if (!probe) {
- /* Ensure ecode is set for log fn. */
- tdb->ecode = TDB1_ERR_IO;
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL,"tdb1_oob len %d beyond eof at %d\n",
- (int)len, (int)st.st_size));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb1_oob len %d beyond eof at %d",
+ (int)len, (int)st.st_size);
}
return -1;
}
/* Unmap, update size, remap */
if (tdb1_munmap(tdb) == -1) {
- tdb->ecode = TDB1_ERR_IO;
+ tdb->last_error = TDB_ERR_IO;
return -1;
}
tdb->map_size = st.st_size;
}
if (tdb->read_only || tdb->traverse_read) {
- tdb->ecode = TDB1_ERR_RDONLY;
+ tdb->last_error = TDB_ERR_RDONLY;
return -1;
}
} else {
ssize_t written = pwrite(tdb->fd, buf, len, off);
if ((written != (ssize_t)len) && (written != -1)) {
- /* try once more */
- tdb->ecode = TDB1_ERR_IO;
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_write: wrote only "
- "%d of %d bytes at %d, trying once more\n",
- (int)written, len, off));
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_WARNING,
+ "tdb1_write: wrote only "
+ "%d of %d bytes at %d, trying once more",
+ (int)written, len, off);
written = pwrite(tdb->fd, (const char *)buf+written,
len-written,
off+written);
}
if (written == -1) {
/* Ensure ecode is set for log fn. */
- tdb->ecode = TDB1_ERR_IO;
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL,"tdb1_write failed at %d "
- "len=%d (%s)\n", off, len, strerror(errno)));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb1_write failed at %d "
+ "len=%d (%s)",
+ off, len, strerror(errno));
return -1;
} else if (written != (ssize_t)len) {
- tdb->ecode = TDB1_ERR_IO;
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_write: failed to "
- "write %d bytes at %d in two attempts\n",
- len, off));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb1_write: failed to "
+ "write %d bytes at %d in two attempts",
+ len, off);
return -1;
}
}
ssize_t ret = pread(tdb->fd, buf, len, off);
if (ret != (ssize_t)len) {
/* Ensure ecode is set for log fn. */
- tdb->ecode = TDB1_ERR_IO;
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL,"tdb1_read failed at %d "
- "len=%d ret=%d (%s) map_size=%d\n",
- (int)off, (int)len, (int)ret, strerror(errno),
- (int)tdb->map_size));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb1_read failed at %d "
+ "len=%d ret=%d (%s) map_size=%d",
+ (int)off, (int)len, (int)ret,
+ strerror(errno),
+ (int)tdb->map_size);
return -1;
}
}
int tdb1_munmap(struct tdb1_context *tdb)
{
- if (tdb->flags & TDB1_INTERNAL)
+ if (tdb->flags & TDB_INTERNAL)
return 0;
#if HAVE_MMAP
void tdb1_mmap(struct tdb1_context *tdb)
{
- if (tdb->flags & TDB1_INTERNAL)
+ if (tdb->flags & TDB_INTERNAL)
return;
#if HAVE_MMAP
- if (!(tdb->flags & TDB1_NOMMAP)) {
+ if (!(tdb->flags & TDB_NOMMAP)) {
tdb->map_ptr = mmap(NULL, tdb->map_size,
PROT_READ|(tdb->read_only? 0:PROT_WRITE),
MAP_SHARED|MAP_FILE, tdb->fd, 0);
if (tdb->map_ptr == MAP_FAILED) {
tdb->map_ptr = NULL;
- TDB1_LOG((tdb, TDB1_DEBUG_WARNING, "tdb1_mmap failed for size %d (%s)\n",
- tdb->map_size, strerror(errno)));
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_WARNING,
+ "tdb1_mmap failed for size %d (%s)",
+ tdb->map_size, strerror(errno));
}
} else {
tdb->map_ptr = NULL;
char buf[8192];
if (tdb->read_only || tdb->traverse_read) {
- tdb->ecode = TDB1_ERR_RDONLY;
+ tdb->last_error = TDB_ERR_RDONLY;
return -1;
}
errno = ENOSPC;
}
if (written != 1) {
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "expand_file to %d failed (%s)\n",
- size+addition, strerror(errno)));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "expand_file to %d failed (%s)",
+ size+addition,
+ strerror(errno));
return -1;
}
}
}
if (written == 0) {
/* give up, trying to provide a useful errno */
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "expand_file write "
- "returned 0 twice: giving up!\n"));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "expand_file write "
+ "returned 0 twice: giving up!");
errno = ENOSPC;
return -1;
} else if (written == -1) {
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "expand_file write of "
- "%d bytes failed (%s)\n", (int)n,
- strerror(errno)));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "expand_file write of "
+ "%d bytes failed (%s)", (int)n,
+ strerror(errno));
return -1;
} else if (written != n) {
- TDB1_LOG((tdb, TDB1_DEBUG_WARNING, "expand_file: wrote "
- "only %d of %d bytes - retrying\n", (int)written,
- (int)n));
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_WARNING,
+ "expand_file: wrote "
+ "only %d of %d bytes - retrying",
+ (int)written, (int)n);
}
addition -= written;
size += written;
tdb1_off_t offset, new_size, top_size, map_size;
if (tdb1_lock(tdb, -1, F_WRLCK) == -1) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "lock failed in tdb1_expand\n"));
+ tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+ "lock failed in tdb1_expand");
return -1;
}
new_size = MAX(top_size, map_size);
size = TDB1_ALIGN(new_size, tdb->page_size) - tdb->map_size;
- if (!(tdb->flags & TDB1_INTERNAL))
+ if (!(tdb->flags & TDB_INTERNAL))
tdb1_munmap(tdb);
/*
*/
/* expand the file itself */
- if (!(tdb->flags & TDB1_INTERNAL)) {
+ if (!(tdb->flags & TDB_INTERNAL)) {
if (tdb->methods->tdb1_expand_file(tdb, tdb->map_size, size) != 0)
goto fail;
}
tdb->map_size += size;
- if (tdb->flags & TDB1_INTERNAL) {
+ if (tdb->flags & TDB_INTERNAL) {
char *new_map_ptr = (char *)realloc(tdb->map_ptr,
tdb->map_size);
if (!new_map_ptr) {
/* some systems don't like zero length malloc */
if (!(buf = (unsigned char *)malloc(len ? len : 1))) {
- /* Ensure ecode is set for log fn. */
- tdb->ecode = TDB1_ERR_OOM;
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,"tdb1_alloc_read malloc failed len=%d (%s)\n",
- len, strerror(errno)));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+ "tdb1_alloc_read malloc failed"
+ " len=%d (%s)",
+ len, strerror(errno));
return NULL;
}
if (tdb->methods->tdb1_read(tdb, offset, buf, len, 0) == -1) {
/* Give a piece of tdb data to a parser */
-int tdb1_parse_data(struct tdb1_context *tdb, TDB1_DATA key,
+int tdb1_parse_data(struct tdb1_context *tdb, TDB_DATA key,
tdb1_off_t offset, tdb1_len_t len,
- int (*parser)(TDB1_DATA key, TDB1_DATA data,
+ int (*parser)(TDB_DATA key, TDB_DATA data,
void *private_data),
void *private_data)
{
- TDB1_DATA data;
+ TDB_DATA data;
int result;
data.dsize = len;
if (tdb->methods->tdb1_read(tdb, offset, rec, sizeof(*rec),TDB1_DOCONV()) == -1)
return -1;
if (TDB1_BAD_MAGIC(rec)) {
- /* Ensure ecode is set for log fn. */
- tdb->ecode = TDB1_ERR_CORRUPT;
- TDB1_LOG((tdb, TDB1_DEBUG_FATAL,"tdb1_rec_read bad magic 0x%x at offset=%d\n", rec->magic, offset));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+ "tdb1_rec_read bad magic 0x%x at offset=%d",
+ rec->magic, offset);
return -1;
}
return tdb->methods->tdb1_oob(tdb, rec->next+sizeof(*rec), 0);
projects / ccan / blobdiff