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

Brute-force s/rpmTag/rpmTagVal/ in entire librpmbuild 

- Many of these cases would be true enums from preambleList & similar,
  except for the list terminating sentinel. Just switch all the
  remaining rpmTag's to rpmTagVals to bring our enum-whacking to
  a grande finale.
This commit is contained in:
Panu Matilainen 2010-10-22 13:46:14 +03:00
parent 07e68a5a77
commit 7c44f57977
12 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/files.c
View File

@ -1576,7 +1576,7 @@ static rpmRC recurseDir(FileList fl, const char * diskPath)
* @return RPMRC_OK on success
*/
static rpmRC processMetadataFile(Package pkg, FileList fl,
const char * fileName, rpmTag tag)
const char * fileName, rpmTagVal tag)
{
const char * buildDir = "%{_builddir}/%{?buildsubdir}/";
char * fn = NULL;

4
build/pack.c
View File

@ -179,7 +179,7 @@ static const char * buildHost(void)
}
/**
*/
static int addFileToTag(rpmSpec spec, const char * file, Header h, rpmTag tag)
static int addFileToTag(rpmSpec spec, const char * file, Header h, rpmTagVal tag)
{
StringBuf sb = newStringBuf();
const char *s = headerGetString(h, tag);
@ -200,7 +200,7 @@ static int addFileToTag(rpmSpec spec, const char * file, Header h, rpmTag tag)
/**
*/
static int addFileToArrayTag(rpmSpec spec, const char *file, Header h, rpmTag tag)
static int addFileToArrayTag(rpmSpec spec, const char *file, Header h, rpmTagVal tag)
{
StringBuf sb = newStringBuf();
const char *s;

30
build/parsePreamble.c
View File

@ -22,7 +22,7 @@
/**
*/
static const rpmTag copyTagsDuringParse[] = {
static const rpmTagVal copyTagsDuringParse[] = {
RPMTAG_EPOCH,
RPMTAG_VERSION,
RPMTAG_RELEASE,
@ -46,7 +46,7 @@ static const rpmTag copyTagsDuringParse[] = {
/**
*/
static const rpmTag requiredTags[] = {
static const rpmTagVal requiredTags[] = {
RPMTAG_NAME,
RPMTAG_VERSION,
RPMTAG_RELEASE,
@ -57,7 +57,7 @@ static const rpmTag requiredTags[] = {
/**
*/
static void addOrAppendListEntry(Header h, rpmTag tag, const char * line)
static void addOrAppendListEntry(Header h, rpmTagVal tag, const char * line)
{
int xx;
int argc;
@ -125,7 +125,7 @@ static struct Source *findSource(rpmSpec spec, uint32_t num, int flag)
return NULL;
}
static int parseNoSource(rpmSpec spec, const char * field, rpmTag tag)
static int parseNoSource(rpmSpec spec, const char * field, rpmTagVal tag)
{
const char *f, *fe;
const char *name;
@ -170,7 +170,7 @@ static int parseNoSource(rpmSpec spec, const char * field, rpmTag tag)
return 0;
}
static int addSource(rpmSpec spec, Package pkg, const char *field, rpmTag tag)
static int addSource(rpmSpec spec, Package pkg, const char *field, rpmTagVal tag)
{
struct Source *p;
int flag = 0;
@ -367,7 +367,7 @@ static inline char * findLastChar(char * s)
/**
*/
static int isMemberInEntry(Header h, const char *name, rpmTag tag)
static int isMemberInEntry(Header h, const char *name, rpmTagVal tag)
{
struct rpmtd_s td;
int found = 0;
@ -433,7 +433,7 @@ exit:
static int checkForRequired(Header h, const char * NVR)
{
int res = RPMRC_OK;
const rpmTag * p;
const rpmTagVal * p;
for (p = requiredTags; *p != 0; p++) {
if (!headerIsEntry(h, *p)) {
@ -456,7 +456,7 @@ static int checkForRequired(Header h, const char * NVR)
static int checkForDuplicates(Header h, const char * NVR)
{
int res = RPMRC_OK;
rpmTag tag, lastTag = RPMTAG_NOT_FOUND;
rpmTagVal tag, lastTag = RPMTAG_NOT_FOUND;
HeaderIterator hi = headerInitIterator(h);
while ((tag = headerNextTag(hi)) != RPMTAG_NOT_FOUND) {
@ -475,7 +475,7 @@ static int checkForDuplicates(Header h, const char * NVR)
/**
*/
static struct optionalTag {
rpmTag ot_tag;
rpmTagVal ot_tag;
const char * ot_mac;
} const optionalTags[] = {
{ RPMTAG_VENDOR, "%{vendor}" },
@ -585,7 +585,7 @@ exit:
return rc;
}
spectag stashSt(rpmSpec spec, Header h, rpmTag tag, const char * lang)
spectag stashSt(rpmSpec spec, Header h, rpmTagVal tag, const char * lang)
{
spectag t = NULL;
@ -650,7 +650,7 @@ rpmRC rpmCharCheck(rpmSpec spec, char *field, size_t fsize, const char *whitelis
/**
*/
static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTag tag,
static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag,
const char *macro, const char *lang)
{
char * field = spec->line;
@ -865,7 +865,7 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTag tag,
/**
*/
typedef const struct PreambleRec_s {
rpmTag tag;
rpmTagVal tag;
int type;
int deprecated;
size_t len;
@ -922,7 +922,7 @@ static struct PreambleRec_s const preambleList[] = {
/**
*/
static int findPreambleTag(rpmSpec spec,rpmTag * tag,
static int findPreambleTag(rpmSpec spec,rpmTagVal * tag,
const char ** macro, char * lang)
{
PreambleRec p;
@ -1025,7 +1025,7 @@ int parsePreamble(rpmSpec spec, int initialPackage)
} else {
while (! (nextPart = isPart(spec->line))) {
const char * macro;
rpmTag tag;
rpmTagVal tag;
/* Skip blank lines */
linep = spec->line;
@ -1096,7 +1096,7 @@ int parsePreamble(rpmSpec spec, int initialPackage)
if (pkg != spec->packages) {
headerCopyTags(spec->packages->header, pkg->header,
(rpmTag *)copyTagsDuringParse);
(rpmTagVal *)copyTagsDuringParse);
}
if (checkForRequired(pkg->header, NVR)) {

4
build/parseReqs.c
View File

@ -35,12 +35,12 @@ const char * token;
#define SKIPWHITE(_x) {while(*(_x) && (risspace(*_x) || *(_x) == ',')) (_x)++;}
#define SKIPNONWHITE(_x){while(*(_x) &&!(risspace(*_x) || *(_x) == ',')) (_x)++;}
rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTag tagN,
rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTagVal tagN,
int index, rpmsenseFlags tagflags)
{
const char *r, *re, *v, *ve;
char * N = NULL, * EVR = NULL;
rpmTag nametag = RPMTAG_NOT_FOUND;
rpmTagVal nametag = RPMTAG_NOT_FOUND;
rpmsenseFlags Flags;
Header h = pkg->header; /* everything except buildrequires go here */
rpmRC rc = RPMRC_FAIL; /* assume failure */

8
build/parseScript.c
View File

@ -69,11 +69,11 @@ int parseScript(rpmSpec spec, int parsePart)
const char **progArgv = NULL;
int progArgc;
const char *partname = NULL;
rpmTag reqtag = 0;
rpmTag tag = 0;
rpmTagVal reqtag = 0;
rpmTagVal tag = 0;
rpmsenseFlags tagflags = 0;
rpmTag progtag = 0;
rpmTag flagtag = 0;
rpmTagVal progtag = 0;
rpmTagVal flagtag = 0;
rpmscriptFlags scriptFlags = 0;
int flag = PART_SUBNAME;
Package pkg;

2
build/parseSpec.c
View File

@ -428,7 +428,7 @@ void closeSpec(rpmSpec spec)
}
}
static const rpmTag sourceTags[] = {
static const rpmTagVal sourceTags[] = {
RPMTAG_NAME,
RPMTAG_VERSION,
RPMTAG_RELEASE,

12
build/reqprov.c
View File

@ -10,9 +10,9 @@
#include "build/rpmbuild_misc.h"
#include "debug.h"
static int isNewDep(Header h, rpmTag nametag,
static int isNewDep(Header h, rpmTagVal nametag,
const char *N, const char *EVR, rpmsenseFlags Flags,
rpmTag indextag, uint32_t index)
rpmTagVal indextag, uint32_t index)
{
int isnew = 1;
struct rpmtd_s idx;
@ -42,13 +42,13 @@ static int isNewDep(Header h, rpmTag nametag,
return isnew;
}
int addReqProv(Header h, rpmTag tagN,
int addReqProv(Header h, rpmTagVal tagN,
const char * N, const char * EVR, rpmsenseFlags Flags,
uint32_t index)
{
rpmTag versiontag = 0;
rpmTag flagtag = 0;
rpmTag indextag = 0;
rpmTagVal versiontag = 0;
rpmTagVal flagtag = 0;
rpmTagVal indextag = 0;
rpmsenseFlags extra = RPMSENSE_ANY;
switch (tagN) {

2
build/rpmbuild.h
View File

@ -95,7 +95,7 @@ rpmps rpmSpecCheckDeps(rpmts ts, rpmSpec spec);
* @param tag dependency tag
* @return dependency set of tag (or NULL)
*/
rpmds rpmSpecDS(rpmSpec spec, rpmTag tag);
rpmds rpmSpecDS(rpmSpec spec, rpmTagVal tag);
/** \ingroup rpmbuild
* Spec build stages state machine driver.

4
build/rpmbuild_internal.h
View File

@ -297,7 +297,7 @@ rpmRC rpmCharCheck(rpmSpec spec, char *field, size_t fsize, const char *whitelis
* @param lang locale
*/
RPM_GNUC_INTERNAL
spectag stashSt(rpmSpec spec, Header h, rpmTag tag, const char * lang);
spectag stashSt(rpmSpec spec, Header h, rpmTagVal tag, const char * lang);
/** \ingroup rpmbuild
* Parse dependency relations from spec file and/or autogenerated output buffer.
@ -310,7 +310,7 @@ spectag stashSt(rpmSpec spec, Header h, rpmTag tag, const char * lang);
* @return RPMRC_OK on success, RPMRC_FAIL on failure
*/
RPM_GNUC_INTERNAL
rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char * field, rpmTag tagN,
rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char * field, rpmTagVal tagN,
int index, rpmsenseFlags tagflags);
/** \ingroup rpmbuild

2
build/rpmbuild_misc.h
View File

@ -96,7 +96,7 @@ uint32_t parseUnsignedNum(const char * line, uint32_t * res);
* @return 0 on success, 1 on error
*/
RPM_GNUC_INTERNAL
int addReqProv(Header h, rpmTag tagN,
int addReqProv(Header h, rpmTagVal tagN,
const char * N, const char * EVR, rpmsenseFlags Flags,
uint32_t index);

10
build/rpmfc.c
View File

@ -416,7 +416,7 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
StringBuf sb_stdin;
rpmds * depsp;
rpmsenseFlags dsContext;
rpmTag tagN;
rpmTagVal tagN;
ARGV_t av = NULL;
int xx;
@ -998,9 +998,9 @@ typedef struct DepMsg_s * DepMsg_t;
struct DepMsg_s {
const char * msg;
char * const argv[4];
rpmTag ntag;
rpmTag vtag;
rpmTag ftag;
rpmTagVal ntag;
rpmTagVal vtag;
rpmTagVal ftag;
int mask;
int xormask;
};
@ -1109,7 +1109,7 @@ static rpmRC rpmfcGenerateDependsHelper(const rpmSpec spec, Package pkg, rpmfi f
appendLineStringBuf(sb_stdin, rpmfiFN(fi));
for (dm = DepMsgs; dm->msg != NULL; dm++) {
rpmTag tag = (dm->ftag > 0) ? dm->ftag : dm->ntag;
rpmTagVal tag = (dm->ftag > 0) ? dm->ftag : dm->ntag;
rpmsenseFlags tagflags;
char * s = NULL;

2
build/spec.c
View File

@ -317,7 +317,7 @@ Header rpmSpecSourceHeader(rpmSpec spec)
return spec->sourceHeader;
}
rpmds rpmSpecDS(rpmSpec spec, rpmTag tag)
rpmds rpmSpecDS(rpmSpec spec, rpmTagVal tag)
{
return (spec != NULL) ? rpmdsNew(spec->buildRestrictions, tag, 0) : NULL;
}