From d68f236bba1c72fd667a7c128ad1cba98180b177 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 18 Jun 2008 12:37:42 +0300 Subject: [PATCH] Convert RPM_BIN_TYPE uses in build to headerPut() --- build/pack.c | 5 +++-- build/parsePreamble.c | 13 ++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build/pack.c b/build/pack.c index fded76b..6ecf046 100644 --- a/build/pack.c +++ b/build/pack.c @@ -751,9 +751,10 @@ rpmRC packageBinaries(rpmSpec spec) if (rpmtdFromString(&td, RPMTAG_SOURCERPM, spec->sourceRpmName)) headerPut(pkg->header, &td, HEADERPUT_DEFAULT); assert(rpmtdType(&td) == RPM_STRING_TYPE); + if (spec->sourcePkgId != NULL) { - (void) headerAddEntry(pkg->header, RPMTAG_SOURCEPKGID, RPM_BIN_TYPE, - spec->sourcePkgId, 16); + if (rpmtdFromUint8(&td, RPMTAG_SOURCEPKGID, spec->sourcePkgId, 16)) + headerPut(pkg->header, &td, HEADERPUT_DEFAULT); } { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL); diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 17aa133..51ed7c0 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -360,11 +360,12 @@ exit: static rpmRC readIcon(Header h, const char * file) { char *fn = NULL; - char *icon; + uint8_t *icon; FD_t fd; rpmRC rc = RPMRC_OK; off_t size; size_t nb, iconsize; + struct rpmtd_s td; /* XXX use rpmGenPath(rootdir, "%{_sourcedir}/", file) for icon path. */ fn = rpmGetPath("%{_sourcedir}/", file, NULL); @@ -397,10 +398,12 @@ static rpmRC readIcon(Header h, const char * file) if (rc != RPMRC_OK) goto exit; - if (! strncmp(icon, "GIF", sizeof("GIF")-1)) { - (void) headerAddEntry(h, RPMTAG_GIF, RPM_BIN_TYPE, icon, iconsize); - } else if (! strncmp(icon, "/* XPM", sizeof("/* XPM")-1)) { - (void) headerAddEntry(h, RPMTAG_XPM, RPM_BIN_TYPE, icon, iconsize); + if (! strncmp((char*)icon, "GIF", sizeof("GIF")-1)) { + if (rpmtdFromUint8(&td, RPMTAG_GIF, icon, iconsize)) + headerPut(h, &td, HEADERPUT_DEFAULT); + } else if (! strncmp((char*)icon, "/* XPM", sizeof("/* XPM")-1)) { + if (rpmtdFromUint8(&td, RPMTAG_XPM, icon, iconsize)) + headerPut(h, &td, HEADERPUT_DEFAULT); } else { rpmlog(RPMLOG_ERR, _("Unknown icon type: %s\n"), file); rc = RPMRC_FAIL; -- 2.7.4