From: Michael Haggerty Date: Tue, 16 Sep 2014 19:33:25 GMT Subject: [PATCH v5 04/35] rollback_lock_file(): exit early if lock is not active Message-ID: <1410896036-12750-5-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1410896036-12750-1-git-send-email-mhagger@alum.mit.edu> Eliminate a layer of nesting. Signed-off-by: Michael Haggerty Reviewed-by: Ronnie Sahlberg --- lockfile.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lockfile.c b/lockfile.c index a548e08..49179d8 100644 --- a/lockfile.c +++ b/lockfile.c @@ -272,10 +272,11 @@ int hold_locked_index(struct lock_file *lk, int die_on_error) void rollback_lock_file(struct lock_file *lk) { - if (lk->filename[0]) { - if (lk->fd >= 0) - close(lk->fd); - unlink_or_warn(lk->filename); - lk->filename[0] = 0; - } + if (!lk->filename[0]) + return; + + if (lk->fd >= 0) + close(lk->fd); + unlink_or_warn(lk->filename); + lk->filename[0] = 0; } -- 2.1.0