folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use rpmTagType always now that it's available everywhere 

- RPM_MASK_TYPE is not a datatype, move it out of the enum
- add missing cases python header handling to shut up gcc
This commit is contained in:
Panu Matilainen 2008-02-05 16:14:34 +02:00
parent bbcf8f5ff0
commit 130118d594
28 changed files with 142 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/files.c
View File

@ -235,7 +235,7 @@ static void timeCheck(int tc, Header h)
HFD_t hfd = headerFreeData;
rpm_time_t * mtime;
const char ** files;
rpm_tagtype_t fnt;
rpmTagType fnt;
rpm_count_t count, x;
time_t currentTime = time(NULL);
@ -2016,7 +2016,7 @@ exit:
void initSourceHeader(rpmSpec spec)
{
HeaderIterator hi;
rpm_tagtype_t type;
rpmTagType type;
rpm_tag_t tag;
rpm_count_t count;
rpm_data_t ptr;

2
build/pack.c
View File

@ -562,7 +562,7 @@ exit:
/* XXX Fish the pkgid out of the signature header. */
if (sig != NULL && pkgidp != NULL) {
rpm_tagtype_t tagType;
rpmTagType tagType;
unsigned char * MD5 = NULL;
rpm_count_t c;
int xx;

4
build/parsePreamble.c
View File

@ -193,7 +193,7 @@ static int isMemberInEntry(Header h, const char *name, rpm_tag_t tag)
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
HFD_t hfd = headerFreeData;
const char ** names;
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
if (!hge(h, tag, &type, (rpm_data_t *)&names, &count))
@ -428,7 +428,7 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpm_tag_t tag,
char ** array;
int multiToken = 0;
rpmsenseFlags tagflags;
rpm_tagtype_t type;
rpmTagType type;
size_t len;
rpm_count_t num;
int rc;

4
build/reqprov.c
View File

@ -16,7 +16,7 @@ int addReqProv(rpmSpec spec, Header h, rpm_tag_t tagN,
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
HFD_t hfd = headerFreeData;
const char ** names;
rpm_tagtype_t dnt;
rpmTagType dnt;
rpm_tag_t nametag = 0;
rpm_tag_t versiontag = 0;
rpm_tag_t flagtag = 0;
@ -64,7 +64,7 @@ int addReqProv(rpmSpec spec, Header h, rpm_tag_t tagN,
/* Check for duplicate dependencies. */
if (hge(h, nametag, &dnt, (rpm_data_t *) &names, &len)) {
const char ** versions = NULL;
rpm_tagtype_t dvt = RPM_STRING_ARRAY_TYPE;
rpmTagType dvt = RPM_STRING_ARRAY_TYPE;
int *flags = NULL;
int *indexes = NULL;
int duplicate = 0;

46
lib/formats.c
View File

@ -25,7 +25,7 @@
* @param element (unused)
* @return formatted string
*/
static char * triggertypeFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * triggertypeFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding,
int element)
{
@ -56,7 +56,7 @@ static char * triggertypeFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element (unused)
* @return formatted string
*/
static char * permsFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * permsFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding, int element)
{
char * val;
@ -84,7 +84,7 @@ static char * permsFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element (unused)
* @return formatted string
*/
static char * fflagsFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * fflagsFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding, int element)
{
char * val;
@ -130,7 +130,7 @@ static char * fflagsFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element no. bytes of binary data
* @return formatted string
*/
static char * armorFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * armorFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding,
int element)
{
@ -180,7 +180,7 @@ static char * armorFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element
* @return formatted string
*/
static char * base64Format(rpm_tagtype_t type, rpm_constdata_t data,
static char * base64Format(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding, int element)
{
char * val;
@ -256,7 +256,7 @@ static char * xmlstrcpy(char * t, const char * s)
* @param element (unused)
* @return formatted string
*/
static char * xmlFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * xmlFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding,
int element)
{
@ -347,7 +347,7 @@ static char * xmlFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element (unused)
* @return formatted string
*/
static char * pgpsigFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * pgpsigFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding,
int element)
{
@ -454,7 +454,7 @@ static char * pgpsigFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element (unused)
* @return formatted string
*/
static char * depflagsFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * depflagsFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding, int element)
{
char * val;
@ -516,14 +516,14 @@ static int fsnamesTag( Header h, int32_t * type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int instprefixTag(Header h, rpm_tagtype_t* type,
static int instprefixTag(Header h, rpmTagType* type,
rpm_data_t * data,
rpm_count_t * count,
int * freeData)
{
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
HFD_t hfd = headerFreeData;
rpm_tagtype_t ipt;
rpmTagType ipt;
char ** array;
if (hge(h, RPMTAG_INSTALLPREFIX, type, (rpm_data_t *)data, count)) {
@ -549,7 +549,7 @@ static int instprefixTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int fssizesTag(Header h, rpm_tagtype_t* type,
static int fssizesTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
@ -599,13 +599,13 @@ static int fssizesTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int triggercondsTag(Header h, rpm_tagtype_t* type,
static int triggercondsTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
HFD_t hfd = headerFreeData;
rpm_tagtype_t tnt, tvt, tst;
rpmTagType tnt, tvt, tst;
int32_t * indices;
char ** names, ** versions;
rpm_count_t numNames, numScripts;
@ -673,13 +673,13 @@ static int triggercondsTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int triggertypeTag(Header h, rpm_tagtype_t* type,
static int triggertypeTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
HFD_t hfd = headerFreeData;
rpm_tagtype_t tst;
rpmTagType tst;
int32_t * indices;
const char ** conds;
const char ** s;
@ -732,7 +732,7 @@ static int triggertypeTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int filenamesTag(Header h, rpm_tagtype_t* type,
static int filenamesTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
@ -751,7 +751,7 @@ static int filenamesTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int fileclassTag(Header h, rpm_tagtype_t* type,
static int fileclassTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
@ -770,7 +770,7 @@ static int fileclassTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int fileprovideTag(Header h, rpm_tagtype_t* type,
static int fileprovideTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
@ -789,7 +789,7 @@ static int fileprovideTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int filerequireTag(Header h, rpm_tagtype_t* type,
static int filerequireTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
@ -818,7 +818,7 @@ static const char * _macro_i18ndomains = "%{?_i18ndomains}";
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int i18nTag(Header h, rpm_tag_t tag, rpm_tagtype_t* type,
static int i18nTag(Header h, rpm_tag_t tag, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
@ -910,7 +910,7 @@ static int i18nTag(Header h, rpm_tag_t tag, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int summaryTag(Header h, rpm_tagtype_t* type,
static int summaryTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
@ -926,7 +926,7 @@ static int summaryTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int descriptionTag(Header h, rpm_tagtype_t* type,
static int descriptionTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{
@ -942,7 +942,7 @@ static int descriptionTag(Header h, rpm_tagtype_t* type,
* @retval *freeData data-was-malloc'ed indicator
* @return 0 on success
*/
static int groupTag(Header h, rpm_tagtype_t* type,
static int groupTag(Header h, rpmTagType* type,
rpm_data_t * data, rpm_count_t * count,
int * freeData)
{

4
lib/idtx.c
View File

@ -79,7 +79,7 @@ IDTX IDTXload(rpmts ts, rpm_tag_t tag)
(void) rpmdbSetIteratorRE(mi, RPMTAG_NAME, RPMMIRE_DEFAULT, '!gpg-pubkey');
#endif
while ((h = rpmdbNextIterator(mi)) != NULL) {
rpm_tagtype_t type = RPM_NULL_TYPE;
rpmTagType type = RPM_NULL_TYPE;
rpm_count_t count = 0;
rpm_tid_t * tidp;
@ -128,7 +128,7 @@ IDTX IDTXglob(rpmts ts, const char * globstr, rpm_tag_t tag)
if (xx == 0)
for (i = 0; i < ac; i++) {
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
int isSource;

4
lib/legacy.c
View File

@ -35,7 +35,7 @@ void compressFilelist(Header h)
const char ** dirNames;
const char ** baseNames;
uint32_t * dirIndexes;
rpm_tagtype_t fnt;
rpmTagType fnt;
rpm_count_t count, i;
int xx;
int dirIndex = -1;
@ -152,7 +152,7 @@ void providePackageNVR(Header h)
rpmsenseFlags pFlags = RPMSENSE_EQUAL;
const char ** provides = NULL;
const char ** providesEVR = NULL;
rpm_tagtype_t pnt, pvt;
rpmTagType pnt, pvt;
rpmsenseFlags * provideFlags = NULL;
rpm_count_t providesCount, i;
int xx;

10
lib/package.c
View File

@ -86,7 +86,7 @@ void headerMergeLegacySigs(Header h, const Header sigh)
HFD_t hfd = (HFD_t) headerFreeData;
HAE_t hae = (HAE_t) headerAddEntry;
HeaderIterator hi;
rpm_tagtype_t type;
rpmTagType type;
rpm_tag_t tag;
rpm_count_t count;
rpm_data_t ptr;
@ -170,7 +170,7 @@ Header headerRegenSigHeader(const Header h, int noArchiveSize)
HeaderIterator hi;
rpm_count_t count;
rpm_tag_t tag, stag;
rpm_tagtype_t type;
rpmTagType type;
rpm_data_t ptr;
int xx;
@ -683,7 +683,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
rpmlead l = NULL;
Header sigh = NULL;
rpm_tag_t sigtag;
rpm_tagtype_t sigtype;
rpmTagType sigtype;
rpm_data_t sig;
rpm_count_t siglen;
rpmtsOpX opx;
@ -824,7 +824,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
goto exit;
}
{ void * uh = NULL;
rpm_tagtype_t uht;
rpmTagType uht;
rpm_count_t uhc;
if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc))
@ -851,7 +851,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
}
case RPMSIGTAG_SHA1:
{ void * uh = NULL;
rpm_tagtype_t uht;
rpmTagType uht;
rpm_count_t uhc;
if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc))

14
lib/psm.c
View File

@ -134,7 +134,7 @@ const char ** argv;
int32_t * i32p;
} body;
char numbuf[32];
rpm_tagtype_t type;
rpmTagType type;
for (tagm = tagMacros; tagm->macroname != NULL; tagm++) {
if (!hge(h, tagm->tag, &type, (rpm_data_t *) &body, NULL))
@ -615,7 +615,7 @@ static rpmRC runScript(rpmpsm psm, Header h, rpm_tag_t stag,
int argc = 0;
const char ** prefixes = NULL;
rpm_count_t numPrefixes;
rpm_tagtype_t ipt;
rpmTagType ipt;
const char * oldPrefix;
size_t maxPrefixLength;
size_t len;
@ -909,7 +909,7 @@ static rpmRC runInstScript(rpmpsm psm)
rpm_data_t * progArgv;
rpm_count_t progArgc;
const char ** argv;
rpm_tagtype_t ptt, stt;
rpmTagType ptt, stt;
char * script;
rpmRC rc = RPMRC_OK;
int xx;
@ -979,7 +979,7 @@ static rpmRC handleOneTrigger(const rpmpsm psm,
(void) rpmdsSetNoPromote(trigger, 1);
while ((i = rpmdsNext(trigger)) >= 0) {
rpm_tagtype_t tit, tst, tpt;
rpmTagType tit, tst, tpt;
const char * Name;
rpmsenseFlags Flags = rpmdsFlags(trigger);
@ -1096,7 +1096,7 @@ static rpmRC runImmedTriggers(rpmpsm psm)
const char ** triggerNames;
rpm_count_t numTriggers, numTriggerIndices;
rpm_count_t * triggerIndices;
rpm_tagtype_t tnt, tit;
rpmTagType tnt, tit;
unsigned char * triggersRun;
rpmRC rc = RPMRC_OK;
@ -1517,7 +1517,7 @@ assert(psm->mi == NULL);
/* Regenerate original header. */
{ void * uh = NULL;
rpm_tagtype_t uht;
rpmTagType uht;
rpm_count_t uhc;
if (headerGetEntry(fi->h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)) {
@ -1527,7 +1527,7 @@ assert(psm->mi == NULL);
if (headerGetEntry(fi->h, RPMTAG_HEADERIMAGE, &uht, &uh, &uhc))
{
HeaderIterator hi;
rpm_tagtype_t type;
rpmTagType type;
rpm_tag_t tag;
rpm_count_t count;
rpm_data_t ptr;

10
lib/rpmchecksig.c
View File

@ -111,7 +111,7 @@ exit:
static int getSignid(Header sig, rpm_tag_t sigtag, pgpKeyID_t signid)
{
rpm_data_t pkt = NULL;
rpm_tagtype_t pkttyp = 0;
rpmTagType pkttyp = 0;
rpm_count_t pktlen = 0;
int rc = 1;
@ -149,7 +149,7 @@ static int rpmReSign(rpmts ts,
Header sigh = NULL;
char * msg;
void * uh = NULL;
rpm_tagtype_t uht;
rpmTagType uht;
rpm_count_t uhc;
int res = EXIT_FAILURE;
int deleting = (qva->qva_mode == RPMSIGN_DEL_SIGNATURE);
@ -210,7 +210,7 @@ static int rpmReSign(rpmts ts,
/* Dump the immutable region (if present). */
if (headerGetEntry(sigh, RPMTAG_HEADERSIGNATURES, &uht, &uh, &uhc)) {
HeaderIterator hi;
rpm_tagtype_t type;
rpmTagType type;
rpm_tag_t tag;
rpm_count_t count;
rpm_data_t ptr;
@ -470,7 +470,7 @@ static int readFile(FD_t fd, const char * fn, pgpDig dig)
if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
void * uh;
rpm_tagtype_t uht;
rpmTagType uht;
rpm_count_t uhc;
if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)
@ -515,7 +515,7 @@ int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd,
char missingKeys[7164], * m;
char untrustedKeys[7164], * u;
rpm_tag_t sigtag;
rpm_tagtype_t sigtype;
rpmTagType sigtype;
rpm_data_t sig;
pgpDig dig;
pgpDigParams sigp;

6
lib/rpmds.c
View File

@ -36,7 +36,7 @@ struct rpmds_s {
int32_t * Refs; /*!< No. of file refs. */
time_t BT; /*!< Package build time tie breaker. */
rpm_tag_t tagN; /*!< Header tag. */
rpm_tagtype_t Nt, EVRt, Ft; /*!< Tag data types. */
rpmTagType Nt, EVRt, Ft; /*!< Tag data types. */
int32_t Count; /*!< No. of elements */
int i; /*!< Element index. */
unsigned l; /*!< Low element (bsearch). */
@ -142,13 +142,13 @@ rpmds rpmdsNew(Header h, rpm_tag_t tagN, int flags)
HGE_t hge =
(scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry);
rpm_tag_t tagBT = RPMTAG_BUILDTIME;
rpm_tagtype_t BTt;
rpmTagType BTt;
rpm_time_t * BTp;
rpm_tag_t tagEVR, tagF;
rpmds ds = NULL;
const char * Type;
const char ** N;
rpm_tagtype_t Nt;
rpmTagType Nt;
rpm_count_t Count;
if (dsType(tagN, &Type, &tagEVR, &tagF))

6
lib/rpmfi.c
View File

@ -627,7 +627,7 @@ Header relocateFileList(const rpmts ts, rpmfi fi,
rpmRelocation * relocations = NULL;
int numRelocations;
const char ** validRelocations;
rpm_tagtype_t validType;
rpmTagType validType;
const char ** baseNames;
const char ** dirNames;
uint32_t * dirIndexes;
@ -995,7 +995,7 @@ dColors[j] |= fColors[i];
if (nrelocated) {
rpm_count_t c;
void * d;
rpm_tagtype_t t;
rpmTagType t;
d = NULL;
xx = hge(h, RPMTAG_BASENAMES, &t, &d, &c);
@ -1492,7 +1492,7 @@ void rpmfiBuildFNames(Header h, rpm_tag_t tagN,
int size;
rpm_tag_t dirNameTag = 0;
rpm_tag_t dirIndexesTag = 0;
rpm_tagtype_t bnt, dnt;
rpmTagType bnt, dnt;
char * t;
int i, xx;

2
lib/rpminstall.c
View File

@ -477,7 +477,7 @@ if (fileURL[0] == '=') {
if (eiu->relocations) {
const char ** paths;
rpm_tagtype_t pft;
rpmTagType pft;
rpm_count_t c;
if (headerGetEntry(eiu->h, RPMTAG_PREFIXES, &pft,

2
lib/rpmtag.h
View File

@ -308,9 +308,9 @@ typedef enum rpmTagType_e {
RPM_BIN_TYPE = 7,
RPM_STRING_ARRAY_TYPE = 8,
RPM_I18NSTRING_TYPE = 9,
RPM_MASK_TYPE = 0x0000ffff
#define RPM_MAX_TYPE 9
#define RPM_FORCEFREE_TYPE 0xff
#define RPM_MASK_TYPE 0x0000ffff
} rpmTagType;
/** \ingroup header

8
lib/rpmts.c
View File

@ -296,7 +296,7 @@ fprintf(stderr, "*** free pkt %p[%d] id %08x %08x\n", ts->pkpkt, ts->pkpktlen, p
mi = rpmtsInitIterator(ts, RPMTAG_PUBKEYS, sigp->signid, sizeof(sigp->signid));
while ((h = rpmdbNextIterator(mi)) != NULL) {
const char ** pubkeys;
rpm_tagtype_t pt;
rpmTagType pt;
rpm_count_t pc;
if (!headerGetEntry(h, RPMTAG_PUBKEYS, &pt, (rpm_data_t *)&pubkeys, &pc))
@ -1148,9 +1148,9 @@ rpm_tag_t rpmtsSigtag(const rpmts ts)
return sigtag;
}
rpm_tagtype_t rpmtsSigtype(const rpmts ts)
rpmTagType rpmtsSigtype(const rpmts ts)
{
rpm_tagtype_t sigtype = 0;
rpmTagType sigtype = 0;
if (ts != NULL)
sigtype = ts->sigtype;
return sigtype;
@ -1172,7 +1172,7 @@ size_t rpmtsSiglen(const rpmts ts)
return siglen;
}
int rpmtsSetSig(rpmts ts, rpm_tag_t sigtag, rpm_tagtype_t sigtype,
int rpmtsSetSig(rpmts ts, rpm_tag_t sigtag, rpmTagType sigtype,
rpm_data_t sig, size_t siglen)
{
if (ts != NULL) {

4
lib/rpmts.h
View File

@ -529,7 +529,7 @@ rpm_tag_t rpmtsSigtag(const rpmts ts);
* @param ts transaction set
* @return signature tag type
*/
rpm_tagtype_t rpmtsSigtype(const rpmts ts);
rpmTagType rpmtsSigtype(const rpmts ts);
/** \ingroup rpmts
* Get signature tag data, i.e. from header.
@ -555,7 +555,7 @@ size_t rpmtsSiglen(const rpmts ts);
* @return 0 always
*/
int rpmtsSetSig(rpmts ts,
rpm_tag_t sigtag, rpm_tagtype_t sigtype,
rpm_tag_t sigtag, rpmTagType sigtype,
rpm_data_t sig, size_t siglen);
/** \ingroup rpmts

2
lib/rpmts_internal.h
View File

@ -99,7 +99,7 @@ struct rpmts_s {
const char * fn; /*!< Current package fn. */
rpm_tag_t sigtag; /*!< Current package signature tag. */
rpm_tagtype_t sigtype; /*!< Current package signature data type. */
rpmTagType sigtype; /*!< Current package signature data type. */
rpm_data_t sig; /*!< Current package signature. */
size_t siglen; /*!< Current package signature length. */

2
lib/rpmtypes.h
View File

@ -26,7 +26,7 @@ typedef struct headerToken_s * Header;
typedef struct headerIterator_s * HeaderIterator;
typedef int32_t rpm_tag_t;
typedef uint32_t rpm_tagtype_t;
typedef uint32_t rpm_tagtype_t; /* unused */
typedef uint32_t rpm_count_t;
typedef void * rpm_data_t;

2
lib/signature.c
View File

@ -639,7 +639,7 @@ static int makeHDRSignature(Header sigh, const char * file, rpm_tag_t sigTag,
if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
DIGEST_CTX ctx;
void * uh;
rpm_tagtype_t uht;
rpmTagType uht;
rpm_count_t uhc;
if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)

13
python/header-py.c
View File

@ -144,7 +144,7 @@ static PyObject * hdrKeyList(hdrObject * s)
PyObject * list, *o;
HeaderIterator hi;
rpm_tag_t tag;
rpm_tagtype_t type;
rpmTagType type;
list = PyList_New(0);
@ -162,6 +162,11 @@ static PyObject * hdrKeyList(hdrObject * s)
case RPM_STRING_TYPE:
PyList_Append(list, o=PyInt_FromLong(tag));
Py_DECREF(o);
break;
case RPM_I18NSTRING_TYPE: /* hum.. ?`*/
case RPM_NULL_TYPE:
default:
break;
}
}
headerFreeIterator(hi);
@ -357,7 +362,7 @@ rpm_tag_t tagNumFromPyObject (PyObject *item)
* @retval c address of number of values
* @return 0 on success, 1 on bad magic, 2 on error
*/
static int dressedHeaderGetEntry(Header h, rpm_tag_t tag, rpm_tagtype_t *type,
static int dressedHeaderGetEntry(Header h, rpm_tag_t tag, rpmTagType *type,
void **p, rpm_count_t *c)
{
switch (tag) {
@ -408,7 +413,7 @@ static int dressedHeaderGetEntry(Header h, rpm_tag_t tag, rpm_tagtype_t *type,
*/
static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
{
rpm_tagtype_t tagtype, type;
rpmTagType tagtype, type;
rpm_tag_t tag = RPMTAG_NOT_FOUND;
rpm_count_t count, i;
rpm_data_t data;
@ -776,7 +781,7 @@ int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag)
hdrObject * hdr;
rpm_count_t c, count = 0;
rpm_tag_t tag;
rpm_tagtype_t type;
rpmTagType type;
void * p;
Py_BEGIN_ALLOW_THREADS

2
rpmdb/fprint.c
View File

@ -244,7 +244,7 @@ void fpLookupHeader(fingerPrintCache cache, Header h, fingerPrint * fpList);
HGE_t hge = (HGE_t)headerGetEntryMinMemory;
HFD_t hfd = headerFreeData;
const char ** baseNames, ** dirNames;
rpm_tagtype_tbnt, dnt;
rpmTagTypebnt, dnt;
uint32_t * dirIndexes;
int fileCount;
int xx;

4
rpmdb/hdrNVR.c
View File

@ -11,7 +11,7 @@
int headerNVR(Header h, const char **np, const char **vp, const char **rp)
{
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
if (np) {
@ -36,7 +36,7 @@ int headerNEVRA(Header h, const char **np,
const char **ep, const char **vp, const char **rp,
const char **ap)
{
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
headerNVR(h, np, vp, rp);

62
rpmdb/header.c
View File

@ -238,7 +238,7 @@ unsigned headerSizeof(Header h, enum hMagic magicp)
for (i = 0, entry = h->index; i < h->indexUsed; i++, entry++) {
unsigned diff;
rpm_tagtype_t type;
rpmTagType type;
/* Regions go in as is ... */
if (ENTRY_IS_REGION(entry)) {
@ -278,7 +278,7 @@ unsigned headerSizeof(Header h, enum hMagic magicp)
* @param pend pointer to end of data (or NULL)
* @return no. bytes in data, -1 on failure
*/
static int dataLength(rpm_tagtype_t type, rpm_constdata_t p, rpm_count_t count,
static int dataLength(rpmTagType type, rpm_constdata_t p, rpm_count_t count,
int onDisk, rpm_constdata_t pend)
{
const unsigned char * s = p;
@ -373,7 +373,7 @@ static int regionSwab(indexEntry entry, int il, int dl,
memset(&ieprev, 0, sizeof(ieprev));
for (; il > 0; il--, pe++) {
struct indexEntry_s ie;
rpm_tagtype_t type;
rpmTagType type;
ie.info.tag = ntohl(pe->tag);
ie.info.type = ntohl(pe->type);
@ -491,7 +491,7 @@ static void * doHeaderUnload(Header h,
int32_t il = 0;
int32_t dl = 0;
indexEntry entry;
rpm_tagtype_t type;
rpmTagType type;
int i;
int drlen, ndribbles;
int driplen, ndrips;
@ -734,7 +734,7 @@ void * headerUnload(Header h)
* @return header entry
*/
static
indexEntry findEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type)
indexEntry findEntry(Header h, rpm_tag_t tag, rpmTagType type)
{
indexEntry entry, entry2, last;
struct indexEntry_s key;
@ -1106,7 +1106,7 @@ int headerIsEntry(Header h, rpm_tag_t tag)
* @return 1 on success, otherwise error.
*/
static int copyEntry(const indexEntry entry,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c,
int minMem)
@ -1340,7 +1340,7 @@ headerFindI18NString(Header h, indexEntry entry)
* @return 1 on success, 0 on not found
*/
static int intGetEntry(Header h, rpm_tag_t tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c,
int minMem)
@ -1374,7 +1374,7 @@ static int intGetEntry(Header h, rpm_tag_t tag,
return ((rc == 1) ? 1 : 0);
}
void * headerFreeTag(Header h, rpm_data_t data, rpm_tagtype_t type)
void * headerFreeTag(Header h, rpm_data_t data, rpmTagType type)
{
if (data) {
if (type == RPM_FORCEFREE_TYPE ||
@ -1387,7 +1387,7 @@ void * headerFreeTag(Header h, rpm_data_t data, rpm_tagtype_t type)
}
int headerGetEntry(Header h, rpm_tag_t tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c)
{
@ -1395,14 +1395,14 @@ int headerGetEntry(Header h, rpm_tag_t tag,
}
int headerGetEntryMinMemory(Header h, rpm_tag_t tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c)
{
return intGetEntry(h, tag, type, (rpm_data_t) p, c, 1);
}
int headerGetRawEntry(Header h, rpm_tag_t tag, rpm_tagtype_t * type, rpm_data_t * p,
int headerGetRawEntry(Header h, rpm_tag_t tag, rpmTagType * type, rpm_data_t * p,
rpm_count_t * c)
{
indexEntry entry;
@ -1427,7 +1427,7 @@ int headerGetRawEntry(Header h, rpm_tag_t tag, rpm_tagtype_t * type, rpm_data_t
/**
*/
static void copyData(rpm_tagtype_t type, rpm_data_t dstPtr,
static void copyData(rpmTagType type, rpm_data_t dstPtr,
rpm_constdata_t srcPtr, rpm_count_t cnt, int dataLength)
{
switch (type) {
@ -1461,7 +1461,7 @@ static void copyData(rpm_tagtype_t type, rpm_data_t dstPtr,
* @return (malloc'ed) copy of entry data, NULL on error
*/
static void *
grabData(rpm_tagtype_t type, rpm_constdata_t p, rpm_count_t c, int * lengthPtr)
grabData(rpmTagType type, rpm_constdata_t p, rpm_count_t c, int * lengthPtr)
{
rpm_data_t data = NULL;
int length;
@ -1477,7 +1477,7 @@ grabData(rpm_tagtype_t type, rpm_constdata_t p, rpm_count_t c, int * lengthPtr)
return data;
}
int headerAddEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
int headerAddEntry(Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c)
{
indexEntry entry;
@ -1520,7 +1520,7 @@ int headerAddEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
return 1;
}
int headerAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
int headerAppendEntry(Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c)
{
indexEntry entry;
@ -1557,7 +1557,7 @@ int headerAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
return 1;
}
int headerAddOrAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
int headerAddOrAppendEntry(Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c)
{
return (findEntry(h, tag, type)
@ -1688,7 +1688,7 @@ int headerAddI18NString(Header h, rpm_tag_t tag, const char * string,
return 0;
}
int headerModifyEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
int headerModifyEntry(Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c)
{
indexEntry entry;
@ -1812,7 +1812,7 @@ HeaderIterator headerInitIterator(Header h)
int headerNextIterator(HeaderIterator hi,
rpm_tag_t * tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c)
{
@ -1851,7 +1851,7 @@ Header headerCopy(Header h)
{
Header nh = headerNew();
HeaderIterator hi;
rpm_tagtype_t type;
rpmTagType type;
rpm_tag_t tag;
rpm_count_t count;
rpm_data_t ptr;
@ -1928,7 +1928,7 @@ static sprintfToken hsaNext(headerSprintfArgs hsa)
hsa->i++;
} else {
rpm_tag_t tagno;
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
if (!headerNextIterator(hsa->hi, &tagno, &type, NULL, &count))
@ -2428,7 +2428,7 @@ static int parseExpression(headerSprintfArgs hsa, sprintfToken token,
* @return 0 on success, 1 on failure
*/
static int getExtension(headerSprintfArgs hsa, headerTagTagFunction fn,
rpm_tagtype_t * typeptr,
rpmTagType * typeptr,
rpm_data_t * data,
rpm_count_t * countptr,
rpmec ec)
@ -2459,7 +2459,7 @@ static char * formatValue(headerSprintfArgs hsa, sprintfTag tag, int element)
size_t need = 0;
char * t, * te;
char buf[20];
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
rpm_data_t data;
unsigned int intVal;
@ -2621,7 +2621,7 @@ static char * singleSprintf(headerSprintfArgs hsa, sprintfToken token,
{
char * t, * te;
int i, j, found;
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count, numElements;
sprintfToken spft;
int condNumFormats;
@ -2885,7 +2885,7 @@ exit:
* @param element (unused)
* @return formatted string
*/
static char * octalFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * octalFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding,int element)
{
char * val;
@ -2910,7 +2910,7 @@ static char * octalFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element (unused)
* @return formatted string
*/
static char * hexFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * hexFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding,int element)
{
char * val;
@ -2928,7 +2928,7 @@ static char * hexFormat(rpm_tagtype_t type, rpm_constdata_t data,
/**
*/
static char * realDateFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * realDateFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding,int element,
const char * strftimeFormat)
{
@ -2965,7 +2965,7 @@ static char * realDateFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element (unused)
* @return formatted string
*/
static char * dateFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * dateFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding, int element)
{
return realDateFormat(type, data, formatPrefix, padding, element,
@ -2981,7 +2981,7 @@ static char * dateFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element (unused)
* @return formatted string
*/
static char * dayFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * dayFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding, int element)
{
return realDateFormat(type, data, formatPrefix, padding, element,
@ -2997,7 +2997,7 @@ static char * dayFormat(rpm_tagtype_t type, rpm_constdata_t data,
* @param element (unused)
* @return formatted string
*/
static char * shescapeFormat(rpm_tagtype_t type, rpm_constdata_t data,
static char * shescapeFormat(rpmTagType type, rpm_constdata_t data,
char * formatPrefix, size_t padding,int element)
{
char * result, * dst, * src, * buf;
@ -3050,7 +3050,7 @@ void headerCopyTags(Header headerFrom, Header headerTo, rpm_tag_t * tagstocopy)
for (p = tagstocopy; *p != 0; p++) {
rpm_data_t s;
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
if (headerIsEntry(headerTo, *p))
continue;
@ -3062,7 +3062,7 @@ void headerCopyTags(Header headerFrom, Header headerTo, rpm_tag_t * tagstocopy)
}
}
void * headerFreeData(rpm_data_t data, rpm_tagtype_t type)
void * headerFreeData(rpm_data_t data, rpmTagType type)
{
if (data) {
if (type == RPM_FORCEFREE_TYPE ||

34
rpmdb/header.h
View File

@ -93,7 +93,7 @@ typedef struct headerTagTableEntry_s * headerTagTableEntry;
struct headerTagTableEntry_s {
const char * name; /*!< Tag name. */
rpm_tag_t val; /*!< Tag numeric value. */
rpm_tagtype_t type; /*!< Tag type. */
rpmTagType type; /*!< Tag type. */
};
/**
@ -121,7 +121,7 @@ enum headerSprintfExtensionType {
* @param element RPM_BIN_TYPE: no. bytes of data
* @return formatted string
*/
typedef char * (*headerTagFormatFunction)(rpm_tagtype_t type,
typedef char * (*headerTagFormatFunction)(rpmTagType type,
rpm_constdata_t data, char * formatPrefix,
size_t padding, rpm_count_t element);
@ -137,7 +137,7 @@ typedef char * (*headerTagFormatFunction)(rpm_tagtype_t type,
* @return 0 on success
*/
typedef int (*headerTagTagFunction) (Header h,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * data,
rpm_count_t * count,
int * freeData);
@ -209,7 +209,7 @@ typedef union hRET_s {
*/
typedef struct HE_s {
rpm_tag_t tag;
rpm_tagtype_t * typ;
rpmTagType * typ;
union {
hPTR_t * ptr;
hRET_t * ret;
@ -334,7 +334,7 @@ int headerIsEntry(Header h, rpm_tag_t tag);
* @param type type of data (or -1 to force free)
* @return NULL always
*/
void * headerFreeTag(Header h, rpm_data_t data, rpm_tagtype_t type);
void * headerFreeTag(Header h, rpm_data_t data, rpmTagType type);
/** \ingroup header
* Retrieve tag value.
@ -350,7 +350,7 @@ void * headerFreeTag(Header h, rpm_data_t data, rpm_tagtype_t type);
* @return 1 on success, 0 on failure
*/
int headerGetEntry(Header h, rpm_tag_t tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c);
@ -367,7 +367,7 @@ int headerGetEntry(Header h, rpm_tag_t tag,
* @return 1 on success, 0 on failure
*/
int headerGetEntryMinMemory(Header h, rpm_tag_t tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c);
@ -385,7 +385,7 @@ int headerGetEntryMinMemory(Header h, rpm_tag_t tag,
* @param c number of values
* @return 1 on success, 0 on failure
*/
int headerAddEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type, rpm_constdata_t p, rpm_count_t c);
int headerAddEntry(Header h, rpm_tag_t tag, rpmTagType type, rpm_constdata_t p, rpm_count_t c);
/** \ingroup header
* Append element to tag array in header.
@ -401,7 +401,7 @@ int headerAddEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type, rpm_constdata_t
* @param c number of values
* @return 1 on success, 0 on failure
*/
int headerAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
int headerAppendEntry(Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c);
/** \ingroup header
@ -414,7 +414,7 @@ int headerAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
* @param c number of values
* @return 1 on success, 0 on failure
*/
int headerAddOrAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
int headerAddOrAppendEntry(Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c);
/** \ingroup header
@ -450,7 +450,7 @@ int headerAddI18NString(Header h, rpm_tag_t tag, const char * string,
* @param c number of values
* @return 1 on success, 0 on failure
*/
int headerModifyEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
int headerModifyEntry(Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c);
/** \ingroup header
@ -513,7 +513,7 @@ HeaderIterator headerInitIterator(Header h);
*/
int headerNextIterator(HeaderIterator hi,
rpm_tag_t * tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c);
@ -528,7 +528,7 @@ int headerNextIterator(HeaderIterator hi,
* @param type type of data (or RPM_FORCEFREE_TYPE to force free)
* @return NULL always
*/
void * headerFreeData(rpm_data_t data, rpm_tagtype_t type);
void * headerFreeData(rpm_data_t data, rpmTagType type);
/** \ingroup header
* Return name, version, release strings from header.
@ -600,7 +600,7 @@ int headerIsSource(Header h);
* @return NULL always
*/
typedef
void * (*HFD_t) (rpm_data_t data, rpm_tagtype_t type);
void * (*HFD_t) (rpm_data_t data, rpmTagType type);
/**
* Prototype for headerGetEntry() vector.
@ -617,7 +617,7 @@ typedef
* @return 1 on success, 0 on failure
*/
typedef int (*HGE_t) (Header h, rpm_tag_t tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c);
@ -636,7 +636,7 @@ typedef int (*HGE_t) (Header h, rpm_tag_t tag,
* @param c number of values
* @return 1 on success, 0 on failure
*/
typedef int (*HAE_t) (Header h, rpm_tag_t tag, rpm_tagtype_t type,
typedef int (*HAE_t) (Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c);
/**
@ -650,7 +650,7 @@ typedef int (*HAE_t) (Header h, rpm_tag_t tag, rpm_tagtype_t type,
* @param c number of values
* @return 1 on success, 0 on failure
*/
typedef int (*HME_t) (Header h, rpm_tag_t tag, rpm_tagtype_t type,
typedef int (*HME_t) (Header h, rpm_tag_t tag, rpmTagType type,
rpm_constdata_t p, rpm_count_t c);
/**

2
rpmdb/header_internal.c
View File

@ -12,7 +12,7 @@
char ** headerGetLangs(Header h)
{
char **s, *e, **table;
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t i, count;
if (!headerGetRawEntry(h, HEADER_I18NTABLE, &type, (rpm_data_t)&s, &count))

6
rpmdb/header_internal.h
View File

@ -23,7 +23,7 @@
typedef struct entryInfo_s * entryInfo;
struct entryInfo_s {
rpm_tag_t tag; /*!< Tag identifier. */
rpm_tagtype_t type; /*!< Tag data type. */
rpmTagType type; /*!< Tag data type. */
int32_t offset; /*!< Offset into data segment (ondisk only). */
rpm_count_t count; /*!< Number of tag elements. */
};
@ -82,7 +82,7 @@ struct sprintfTag_s {
*/
typedef struct rpmec_s * rpmec;
struct rpmec_s {
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
int avail;
int freeit;
@ -146,7 +146,7 @@ char ** headerGetLangs(Header h);
* @return 1 on success, 0 on failure
*/
int headerGetRawEntry(Header h, rpm_tag_t tag,
rpm_tagtype_t * type,
rpmTagType * type,
rpm_data_t * p,
rpm_count_t * c);

12
rpmdb/rpmdb.c
View File

@ -1098,7 +1098,7 @@ static int rpmdbFindByFile(rpmdb db, const char * filespec,
HFD_t hfd = headerFreeData;
const char * dirName;
const char * baseName;
rpm_tagtype_t bnt, dnt;
rpmTagType bnt, dnt;
fingerPrintCache fpc;
fingerPrint fp1;
dbiIndex dbi = NULL;
@ -1843,7 +1843,7 @@ static int mireSkip (const rpmdbMatchIterator mi)
int8_t * i8p;
} u;
char numbuf[32];
rpm_tagtype_t t;
rpmTagType t;
rpm_count_t c;
miRE mire;
static int32_t zero = 0;
@ -2471,7 +2471,7 @@ memset(data, 0, sizeof(*data));
dbiIndex dbi;
const char *av[1];
const char ** rpmvals = NULL;
rpm_tagtype_t rpmtype = 0;
rpmTagType rpmtype = 0;
rpm_count_t rpmcnt = 0;
rpm_tag_t rpmtag;
int xx;
@ -2704,7 +2704,7 @@ DBT * data = alloca(sizeof(*data));
HFD_t hfd = headerFreeData;
sigset_t signalMask;
const char ** baseNames;
rpm_tagtype_t bnt;
rpmTagType bnt;
rpm_count_t count = 0;
dbiIndex dbi;
int dbix;
@ -2824,7 +2824,7 @@ memset(data, 0, sizeof(*data));
for (dbix = 0; dbix < dbiTagsMax; dbix++) {
const char *av[1];
const char **rpmvals = NULL;
rpm_tagtype_t rpmtype = 0;
rpmTagType rpmtype = 0;
rpm_count_t rpmcnt = 0;
rpm_tag_t rpmtag;
rpm_flag_t * requireFlags;
@ -3161,7 +3161,7 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
const char ** dirNames;
const char ** baseNames;
const char ** fullBaseNames;
rpm_tagtype_t bnt, dnt;
rpmTagType bnt, dnt;
uint32_t * dirIndexes;
uint32_t * fullDirIndexes;
fingerPrint * fps;

8
tools/rpminject.c
View File

@ -42,7 +42,7 @@ static const char * pr_injmode(injmode_t injmode)
enum cvtaction {CA_OLD, CA_NEW, CA_OMIT, CA_ERR};
static enum cvtaction convertAMD(enum cvtaction ca, rpm_tagtype_t type,
static enum cvtaction convertAMD(enum cvtaction ca, rpmTagType type,
void ** nvalsp, rpm_count_t *ncountp, cmd_t *newc)
{
int i;
@ -119,7 +119,7 @@ static enum cvtaction convertAMD(enum cvtaction ca, rpm_tagtype_t type,
return ca;
}
static enum cvtaction convertExistingAMD(rpm_tag_t tag, rpm_tagtype_t type,
static enum cvtaction convertExistingAMD(rpm_tag_t tag, rpmTagType type,
rpm_data_t valsp, rpm_count_t *countp, void ** nvalsp, rpm_count_t *ncountp,
cmd_t *cmds[], int ncmds)
{
@ -194,7 +194,7 @@ static
Header headerCopyWithConvert(Header h, cmd_t *cmds[], int ncmds)
{
rpm_tag_t tag;
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t count;
rpm_data_t vals;
HeaderIterator headerIter;
@ -299,7 +299,7 @@ headerInject(Header *hdrp, cmd_t *cmds[], int ncmds)
rc = headerIsEntry(h, c->tagval);
if (!rc && !c->done && c->injmode != INJ_DELETE) {
rpm_tagtype_t type;
rpmTagType type;
rpm_count_t ncount;
void *nvals;
enum cvtaction ca;