memset(&data, 0, sizeof(data));
key.data = (void *) &mi->mi_prevoffset;
key.size = sizeof(mi->mi_prevoffset);
- data.data = headerUnload(mi->mi_h);
- data.size = headerSizeof(mi->mi_h, HEADER_MAGIC_NO);
+ data.data = headerExport(mi->mi_h, &data.size);
/* Check header digest/signature on blob export (if requested). */
if (mi->mi_hdrchk && mi->mi_ts) {
memset(&hdr, 0, sizeof(hdr));
- hdr.size = headerSizeof(h, HEADER_MAGIC_NO);
- hdr.data = headerUnload(h);
+ hdr.data = headerExport(h, &hdr.size);
hdrOk = (hdr.data != NULL && hdr.size > 0);
if (!hdrOk) {
h = headerReload(h, RPMTAG_HEADERIMMUTABLE);
if (h != NULL) {
char *sha1 = NULL;
- const void *blob = headerUnload(h);
- size_t blen = headerSizeof(h, HEADER_MAGIC_NO);
+ unsigned int blen = 0;
+ const void *blob = headerExport(h, &blen);
/* XXX FIXME: bah, this code is repeated in way too many places */
DIGEST_CTX ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
{
PyObject *res = NULL;
char *buf = NULL;
- size_t len;
+ unsigned int len;
Header h = headerLink(s->h);
/* XXX this legacy switch is a hack, needs to be removed. */
h = headerCopy(s->h); /* XXX strip region tags, etc */
headerFree(s->h);
}
- len = headerSizeof(h, HEADER_MAGIC_NO);
- buf = headerUnload(h);
+ buf = headerExport(h, &len);
h = headerFree(h);
if (buf == NULL || len == 0) {