diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-10-06 15:13:22 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-10-06 15:13:22 +0300 |
| commit | 1de7539ea8b7febadd0d31b5be049dcdd7179e4a (patch) | |
| tree | 781aaf633a49c67538d5d7235d8f5892efaeac48 | |
| parent | c3a6ad8856600a00facb95abcb479fc6b39e6116 (diff) | |
| download | rpm-1de7539ea8b7febadd0d31b5be049dcdd7179e4a.tar.gz rpm-1de7539ea8b7febadd0d31b5be049dcdd7179e4a.tar.bz2 rpm-1de7539ea8b7febadd0d31b5be049dcdd7179e4a.zip | |
Eliminate headerMergeLegacySigs() from the API
- No need to export this in the API - if you want merged signature
tags you use rpm's package reading functions.
| -rw-r--r-- | build/pack.c | 4 | ||||
| -rw-r--r-- | lib/package.c | 7 | ||||
| -rw-r--r-- | lib/rpmlib.h | 8 |
3 files changed, 6 insertions, 13 deletions
diff --git a/build/pack.c b/build/pack.c index 9e39067e3..af3af9a5f 100644 --- a/build/pack.c +++ b/build/pack.c @@ -465,10 +465,6 @@ static rpmRC writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileNam goto exit; } -#ifdef NOTYET - (void) headerMergeLegacySigs(nh, sig); -#endif - xx = headerWrite(fd, nh, HEADER_MAGIC_YES); headerFree(nh); diff --git a/lib/package.c b/lib/package.c index 9940aa88c..dc957efb7 100644 --- a/lib/package.c +++ b/lib/package.c @@ -27,7 +27,12 @@ static unsigned int nkeyids = 0; static unsigned int nextkeyid = 0; static unsigned int * keyids; -void headerMergeLegacySigs(Header h, const Header sigh) +/** \ingroup header + * Translate and merge legacy signature tags into header. + * @param h header (dest) + * @param sigh signature header (src) + */ +static void headerMergeLegacySigs(Header h, Header sigh) { HeaderIterator hi; struct rpmtd_s td; diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 30c016c34..5a0485e8e 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -35,14 +35,6 @@ extern const char * const rpmEVR; extern const int rpmFLAGS; -/** \ingroup header - * Translate and merge legacy signature tags into header. - * @todo Remove headerSort() through headerInitIterator() modifies sig. - * @param h header - * @param sigh signature header - */ -void headerMergeLegacySigs(Header h, const Header sigh); - /* ==================================================================== */ /** \name RPMRC */ |