From 11a7d407954965a27223ecc0974d7eba59d524e4 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 30 May 2011 12:37:06 +0300 Subject: [PATCH] rpmgiFree() cleanup to remove an exit point and dead assignment(s) --- lib/rpmgi.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/rpmgi.c b/lib/rpmgi.c index 1b2de8a..89707df 100644 --- a/lib/rpmgi.c +++ b/lib/rpmgi.c @@ -175,14 +175,13 @@ static void rpmgiGlobArgv(rpmgi gi, ARGV_const_t argv) rpmgi rpmgiFree(rpmgi gi) { - if (gi == NULL) - return NULL; + if (gi != NULL) { + rpmtsFree(gi->ts); + argvFree(gi->argv); - gi->ts = rpmtsFree(gi->ts); - gi->argv = argvFree(gi->argv); - - memset(gi, 0, sizeof(*gi)); /* XXX trash and burn */ - gi = _free(gi); + memset(gi, 0, sizeof(*gi)); /* XXX trash and burn */ + free(gi); + } return NULL; } -- 2.7.4