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
This commit is contained in:
parent
738d05bb1b
commit
e7b55f61a9
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue