summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-03-04 13:06:05 +0100
committerStefan Metzmacher <metze@samba.org>2013-03-05 14:00:47 +0100
commit68698b4e64831d2fdf762b5f8577ff404f10a3cb (patch)
treec296c37a563fc8f2a782bf6b53f007830c7585a4
parent70e1b6185e3fb35fdc72eeb529ffb4b50122dc40 (diff)
downloadsamba-68698b4e64831d2fdf762b5f8577ff404f10a3cb.tar.gz
samba-68698b4e64831d2fdf762b5f8577ff404f10a3cb.tar.bz2
samba-68698b4e64831d2fdf762b5f8577ff404f10a3cb.zip
tdb: Slightly simplify tdb_expand_file
The "else" keywords are not necessary here, we return in the preceding if clause Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Tue Mar 5 14:00:47 CET 2013 on sn-devel-104
-rw-r--r--lib/tdb/common/io.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/tdb/common/io.c b/lib/tdb/common/io.c
index 0563635e6f..b9caffb1e5 100644
--- a/lib/tdb/common/io.c
+++ b/lib/tdb/common/io.c
@@ -328,12 +328,14 @@ static int tdb_expand_file(struct tdb_context *tdb, tdb_off_t size, tdb_off_t ad
"returned 0 twice: giving up!\n"));
errno = ENOSPC;
return -1;
- } else if (written == -1) {
+ }
+ if (written == -1) {
TDB_LOG((tdb, TDB_DEBUG_FATAL, "expand_file write of "
"%d bytes failed (%s)\n", (int)n,
strerror(errno)));
return -1;
- } else if (written != n) {
+ }
+ if (written != n) {
TDB_LOG((tdb, TDB_DEBUG_WARNING, "expand_file: wrote "
"only %d of %d bytes - retrying\n", (int)written,
(int)n));