From e7b55f61a984de68dbe67aad702b845ed4eeff15 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Sat, 28 May 2011 22:24:37 +0300
Subject: [PATCH] Eliminate dead NULL-assignments at scope-end in librpm, part
 II - Remove NULL-assignments of local variables at the end of scope   in
 package+signature manipulation code

---
 lib/package.c   | 10 +++++-----
 lib/signature.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/package.c b/lib/package.c
index 51fd20b..2e8d345 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -94,7 +94,7 @@ void headerMergeLegacySigs(Header h, const Header sigh)
 	    (void) headerPut(h, &td, HEADERPUT_DEFAULT);
 	}
     }
-    hi = headerFreeIterator(hi);
+    headerFreeIterator(hi);
 }
 
 Header headerRegenSigHeader(const Header h, int noArchiveSize)
@@ -139,7 +139,7 @@ Header headerRegenSigHeader(const Header h, int noArchiveSize)
 	if (!headerIsEntry(sigh, td.tag))
 	    (void) headerPut(sigh, &td, HEADERPUT_DEFAULT);
     }
-    hi = headerFreeIterator(hi);
+    headerFreeIterator(hi);
     return sigh;
 }
 
@@ -516,8 +516,8 @@ static rpmRC rpmpkgReadHeader(rpmKeyring keyring, rpmVSFlags vsflags,
 exit:
     if (hdrp && h && rc == RPMRC_OK)
 	*hdrp = headerLink(h);
-    ei = _free(ei);
-    h = headerFree(h);
+    free(ei);
+    headerFree(h);
 
     if (msg != NULL && *msg == NULL && buf != NULL) {
 	*msg = buf;
@@ -798,7 +798,7 @@ rpmRC headerCheckPayloadFormat(Header h) {
                      _("Unsupported payload (%s) in package %s\n"),
                      payloadfmt ? payloadfmt : "none", nevra);
         } 
-        nevra = _free(nevra);
+        free(nevra);
 	rc = RPMRC_FAIL;
     }
     return rc;
diff --git a/lib/signature.c b/lib/signature.c
index e0b4893..955cb1c 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -233,7 +233,7 @@ rpmRC rpmReadSignature(FD_t fd, Header * sighp, sigType sig_type, char ** msg)
 exit:
     if (sighp && sigh && rc == RPMRC_OK)
 	*sighp = headerLink(sigh);
-    sigh = headerFree(sigh);
+    headerFree(sigh);
     free(ei);
 
     if (msg != NULL) {
@@ -323,7 +323,7 @@ static int makeHDRDigest(Header sigh, const char * file, rpmTagVal sigTag)
 
 exit:
     free(SHA1);
-    h = headerFree(h);
+    headerFree(h);
     if (fd != NULL) (void) Fclose(fd);
     return ret;
 }
-- 
2.7.4