Reviewed-by: Ronnie Sahlberg <sahlberg@xxxxxxxxxx> On Sat, Sep 6, 2014 at 12:50 AM, Michael Haggerty <mhagger@xxxxxxxxxxxx> wrote: > Eliminate a layer of nesting. > > Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx> > --- > 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 > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html