summaryrefslogtreecommitdiff
path: root/lib/tdb/common
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2017-08-23 12:59:19 +0200
committerJeremy Allison <jra@samba.org>2017-08-24 01:46:08 +0200
commita05debc113847ca3fd46ea63ec05a3fa357aa8e5 (patch)
tree1a20d9d68007ba9ec1ed57a405ca2c65682d430d /lib/tdb/common
parentc7211882a79a99ed70a1aceeafa232cd521c915d (diff)
downloadsamba-a05debc113847ca3fd46ea63ec05a3fa357aa8e5.tar.gz
tdb: Add an intermediate variable
More README.Coding, but I need "ret" in the next commit as well :-) Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/tdb/common')
-rw-r--r--lib/tdb/common/io.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tdb/common/io.c b/lib/tdb/common/io.c
index f7a12c34dc9..ff3f2197ed2 100644
--- a/lib/tdb/common/io.c
+++ b/lib/tdb/common/io.c
@@ -379,6 +379,7 @@ static int tdb_expand_file(struct tdb_context *tdb, tdb_off_t size, tdb_off_t ad
{
char buf[8192];
tdb_off_t new_size;
+ int ret;
if (tdb->read_only || tdb->traverse_read) {
tdb->ecode = TDB_ERR_RDONLY;
@@ -394,7 +395,8 @@ static int tdb_expand_file(struct tdb_context *tdb, tdb_off_t size, tdb_off_t ad
return -1;
}
- if (tdb_ftruncate(tdb, new_size) == -1) {
+ ret = tdb_ftruncate(tdb, new_size);
+ if (ret == -1) {
char b = 0;
ssize_t written = tdb_pwrite(tdb, &b, 1, new_size - 1);
if (written == 0) {
@@ -452,7 +454,6 @@ static int tdb_expand_file(struct tdb_context *tdb, tdb_off_t size, tdb_off_t ad
fail:
{
int err = errno;
- int ret;
/*
* We're holding the freelist lock or are inside a