*/
if (tdb->map_ptr == MAP_FAILED) {
tdb->map_ptr = NULL;
- tdb->log(tdb, TDB_DEBUG_WARNING, tdb->log_priv,
- "tdb_mmap failed for size %lld (%s)\n",
- (long long)tdb->map_size, strerror(errno));
+ tdb_logerr(tdb, TDB_SUCCESS, TDB_DEBUG_WARNING,
+ "tdb_mmap failed for size %lld (%s)",
+ (long long)tdb->map_size, strerror(errno));
}
}
static int tdb_oob(struct tdb_context *tdb, tdb_off_t len, bool probe)
{
struct stat st;
- int ret;
/* We can't hold pointers during this: we could unmap! */
assert(!tdb->direct_access
return 0;
if (tdb->flags & TDB_INTERNAL) {
if (!probe) {
- /* Ensure ecode is set for log fn. */
- tdb->ecode = TDB_ERR_IO;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
"tdb_oob len %lld beyond internal"
- " malloc size %lld\n",
+ " malloc size %lld",
(long long)len,
(long long)tdb->map_size);
}
if (tdb_lock_expand(tdb, F_RDLCK) != 0)
return -1;
- ret = fstat(tdb->fd, &st);
-
- tdb_unlock_expand(tdb, F_RDLCK);
-
- if (ret == -1) {
- tdb->ecode = TDB_ERR_IO;
+ if (fstat(tdb->fd, &st) != 0) {
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ "Failed to fstat file: %s", strerror(errno));
+ tdb_unlock_expand(tdb, F_RDLCK);
return -1;
}
+ tdb_unlock_expand(tdb, F_RDLCK);
+
if (st.st_size < (size_t)len) {
if (!probe) {
- /* Ensure ecode is set for log fn. */
- tdb->ecode = TDB_ERR_IO;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_oob len %lld beyond eof at %lld\n",
- (long long)len, (long long)st.st_size);
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ "tdb_oob len %zu beyond eof at %zu",
+ (size_t)len, st.st_size);
}
return -1;
}
char buf[8192] = { 0 };
void *p = tdb->methods->direct(tdb, off, len);
- if (tdb->read_only) {
- tdb->ecode = TDB_ERR_RDONLY;
- return -1;
- }
-
+ assert(!tdb->read_only);
if (p) {
memset(p, 0, len);
return 0;
static int tdb_write(struct tdb_context *tdb, tdb_off_t off,
const void *buf, tdb_len_t len)
{
- if (len == 0) {
- return 0;
- }
-
if (tdb->read_only) {
- tdb->ecode = TDB_ERR_RDONLY;
+ tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_DEBUG_WARNING,
+ "Write to read-only database");
return -1;
}
+ /* FIXME: Bogus optimization? */
+ if (len == 0) {
+ return 0;
+ }
+
if (tdb->methods->oob(tdb, off + len, 0) != 0)
return -1;
memcpy(off + (char *)tdb->map_ptr, buf, len);
} else {
if (!tdb_pwrite_all(tdb->fd, buf, len, off)) {
- tdb->ecode = TDB_ERR_IO;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_write failed at %llu len=%llu (%s)\n",
- (long long)off, (long long)len,
- strerror(errno));
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ "tdb_write failed at %zu len=%zu (%s)",
+ (size_t)off, (size_t)len, strerror(errno));
return -1;
}
}
memcpy(buf, off + (char *)tdb->map_ptr, len);
} else {
if (!tdb_pread_all(tdb->fd, buf, len, off)) {
- /* Ensure ecode is set for log fn. */
- tdb->ecode = TDB_ERR_IO;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_read failed at %lld "
- "len=%lld (%s) map_size=%lld\n",
- (long long)off, (long long)len,
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ "tdb_read failed at %zu "
+ "len=%zu (%s) map_size=%zu",
+ (size_t)off, (size_t)len,
strerror(errno),
- (long long)tdb->map_size);
+ (size_t)tdb->map_size);
return -1;
}
}
if (unlikely((tdb->flags & TDB_CONVERT))) {
void *conv = malloc(len);
if (!conv) {
- tdb->ecode = TDB_ERR_OOM;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_write: no memory converting %zu bytes\n",
- len);
+ tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_FATAL,
+ "tdb_write: no memory converting"
+ " %zu bytes", len);
return -1;
}
memcpy(conv, rec, len);
int tdb_write_off(struct tdb_context *tdb, tdb_off_t off, tdb_off_t val)
{
if (tdb->read_only) {
- tdb->ecode = TDB_ERR_RDONLY;
+ tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_DEBUG_WARNING,
+ "Write to read-only database");
return -1;
}
/* some systems don't like zero length malloc */
buf = malloc(prefix + len ? prefix + len : 1);
- if (unlikely(!buf)) {
- tdb->ecode = TDB_ERR_OOM;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_alloc_read malloc failed len=%lld\n",
- (long long)prefix + len);
- } else if (unlikely(tdb->methods->read(tdb, offset, buf+prefix, len))) {
+ if (!buf) {
+ tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_ERROR,
+ "tdb_alloc_read malloc failed len=%zu",
+ (size_t)(prefix + len));
+ } else if (unlikely(tdb->methods->read(tdb, offset, buf+prefix,
+ len) == -1)) {
free(buf);
buf = NULL;
}
size_t n = len > size ? size : len;
if (!tdb_pwrite_all(tdb->fd, buf, n, off)) {
- tdb->ecode = TDB_ERR_IO;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "fill write failed: giving up!\n");
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ "fill write failed: giving up!");
return -1;
}
len -= n;
char buf[8192];
if (tdb->read_only) {
- tdb->ecode = TDB_ERR_RDONLY;
+ tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_DEBUG_WARNING,
+ "Expand on read-only database");
return -1;
}
if (tdb->flags & TDB_INTERNAL) {
char *new = realloc(tdb->map_ptr, tdb->map_size + addition);
if (!new) {
- tdb->ecode = TDB_ERR_OOM;
+ tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_FATAL,
+ "No memory to expand database");
return -1;
}
tdb->map_ptr = new;
void *ret = NULL;
if (tdb->read_only) {
- tdb->ecode = TDB_ERR_RDONLY;
+ tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_DEBUG_WARNING,
+ "Write to read-only database");
return NULL;
}