X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=lib%2Ftdb%2Fcommon%2Fio.c;h=44ef7289a6395c10a64ec3cfb9b12e2587b261d6;hb=a07ba17e0c91d726416db946e6f65b064b2d17ec;hp=a477fb55e4b1f4e1cc74cf90aa1e60e38c1771b6;hpb=4483bf143ddfee9ec07aed8f124559b00f757d9a;p=obnox%2Fsamba%2Fsamba-obnox.git

diff --git a/lib/tdb/common/io.c b/lib/tdb/common/io.c
index a477fb55e4b..44ef7289a63 100644
--- a/lib/tdb/common/io.c
+++ b/lib/tdb/common/io.c
@@ -287,18 +287,21 @@ int tdb_mmap(struct tdb_context *tdb)
 static int tdb_expand_file(struct tdb_context *tdb, tdb_off_t size, tdb_off_t addition)
 {
 	char buf[8192];
+	tdb_off_t new_size;
 
 	if (tdb->read_only || tdb->traverse_read) {
 		tdb->ecode = TDB_ERR_RDONLY;
 		return -1;
 	}
 
-	if (ftruncate(tdb->fd, size+addition) == -1) {
+	new_size = size + addition;
+
+	if (ftruncate(tdb->fd, new_size) == -1) {
 		char b = 0;
-		ssize_t written = pwrite(tdb->fd,  &b, 1, (size+addition) - 1);
+		ssize_t written = pwrite(tdb->fd,  &b, 1, new_size - 1);
 		if (written == 0) {
 			/* try once more, potentially revealing errno */
-			written = pwrite(tdb->fd,  &b, 1, (size+addition) - 1);
+			written = pwrite(tdb->fd,  &b, 1, new_size - 1);
 		}
 		if (written == 0) {
 			/* again - give up, guessing errno */
@@ -306,7 +309,7 @@ static int tdb_expand_file(struct tdb_context *tdb, tdb_off_t size, tdb_off_t ad
 		}
 		if (written != 1) {
 			TDB_LOG((tdb, TDB_DEBUG_FATAL, "expand_file to %u failed (%s)\n",
-				 size+addition, strerror(errno)));
+				 (unsigned)new_size, strerror(errno)));
 			return -1;
 		}
 	}