diff options
| author | jbj <devnull@localhost> | 2002-07-13 19:08:51 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-07-13 19:08:51 +0000 |
| commit | 261b4a2ecbc7b4ccef094490c74e90f8cfdacfff (patch) | |
| tree | 16df21598d84a9ba57f8b5accd422c75607c980f /lib/signature.c | |
| parent | b9df0c51e490b2a2e158a8525d7753cb1fe1bc6e (diff) | |
| download | librpm-tizen-261b4a2ecbc7b4ccef094490c74e90f8cfdacfff.tar.gz librpm-tizen-261b4a2ecbc7b4ccef094490c74e90f8cfdacfff.tar.bz2 librpm-tizen-261b4a2ecbc7b4ccef094490c74e90f8cfdacfff.zip | |
- install rpmal.h and rpmhash.h, implicit rpmps.hinclude, for now.
- revert headerFree/headerLink/headerUnlink debugging.
CVS patchset: 5550
CVS date: 2002/07/13 19:08:51
Diffstat (limited to 'lib/signature.c')
| -rw-r--r-- | lib/signature.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/signature.c b/lib/signature.c index e2daeb2d4..443824731 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -8,7 +8,6 @@ #include <rpmlib.h> #include <rpmmacro.h> /* XXX for rpmGetPath() */ #include "rpmdb.h" -#include "rpmps.h" #define _RPMTS_INTERNAL #include "rpmts.h" @@ -221,10 +220,10 @@ rpmRC rpmReadSignature(FD_t fd, Header * headerp, sigType sig_type) /*@-boundswrite@*/ if (headerp && rc == RPMRC_OK) - *headerp = headerLink(h, NULL); + *headerp = headerLink(h); /*@=boundswrite@*/ - h = headerFree(h, NULL); + h = headerFree(h); return rc; } @@ -259,7 +258,7 @@ Header rpmNewSignature(void) Header rpmFreeSignature(Header h) { - return headerFree(h, "FreeSignature"); + return headerFree(h); } /** @@ -561,7 +560,7 @@ static int makeHDRSignature(Header sig, const char * file, int_32 sigTag, if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc) || uh == NULL) { - h = headerFree(h, NULL); + h = headerFree(h); goto exit; } ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE); @@ -570,7 +569,7 @@ static int makeHDRSignature(Header sig, const char * file, int_32 sigTag, (void) rpmDigestFinal(ctx, (void **)&sha1, NULL, 1); uh = headerFreeData(uh, uht); } - h = headerFree(h, NULL); + h = headerFree(h); if (sha1 == NULL) goto exit; @@ -622,7 +621,7 @@ exit: fn = _free(fn); } sha1 = _free(sha1); - h = headerFree(h, NULL); + h = headerFree(h); if (fd) (void) Fclose(fd); return ret; } |