From 3109b541c9b2f0063e1ccb0cdaec0a8e388b29b4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 14 Dec 2012 15:53:08 +0100 Subject: [PATCH] tdb: Make tdb_new_database() follow a more conventional style We usually "goto fail" on every error and then in normal flow set the return variable to success. This patch removes a comment which from my point of view is now obsolete. It violates the {} rule from README.Coding here in favor of the style used in this function. Reviewed-by: Rusty Russell Reviewed-by: Stefan Metzmacher --- lib/tdb/common/open.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c index 694701f69dc..b10f5ebe974 100644 --- a/lib/tdb/common/open.c +++ b/lib/tdb/common/open.c @@ -94,10 +94,11 @@ static int tdb_new_database(struct tdb_context *tdb, int hash_size) memcpy(&tdb->header, newdb, sizeof(tdb->header)); /* Don't endian-convert the magic food! */ memcpy(newdb->magic_food, TDB_MAGIC_FOOD, strlen(TDB_MAGIC_FOOD)+1); - /* we still have "ret == -1" here */ - if (tdb_write_all(tdb->fd, newdb, size)) - ret = 0; + if (!tdb_write_all(tdb->fd, newdb, size)) + goto fail; + + ret = 0; fail: SAFE_FREE(newdb); return ret; -- 2.11.4.GIT