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

Avoid stepping on toes of relatives, part 3 

- Eliminate remaining (hopefully) C++ reserved keywords in librpmbuild
This commit is contained in:
Panu Matilainen 2010-09-21 15:07:08 +03:00
parent 7e53dc6ee1
commit c60bf8f766
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/files.c
View File

@ -233,7 +233,7 @@ static char *strtokWithQuotes(char *s, const char *delim)
*/
typedef const struct VFA {
const char const * attribute;
int not;
int neg; /* XXX unused */
int flag;
} VFA_t;
@ -892,7 +892,7 @@ static rpmRC parseForSimple(rpmSpec spec, Package pkg, char * buf,
if (rstreq(s, "%dir"))
fl->isDir = 1; /* XXX why not RPMFILE_DIR? */
} else {
if (vfa->not)
if (vfa->neg)
fl->currentFlags &= ~vfa->flag;
else
fl->currentFlags |= vfa->flag;

8
build/reqprov.c
View File

@ -14,7 +14,7 @@ static int isNewDep(Header h, rpmTag nametag,
const char *N, const char *EVR, rpmsenseFlags Flags,
rpmTag indextag, uint32_t index)
{
int new = 1;
int isnew = 1;
struct rpmtd_s idx;
rpmds ads = rpmdsNew(h, nametag, 0);
rpmds bds = rpmdsSingle(nametag, N, EVR, Flags);
@ -25,13 +25,13 @@ static int isNewDep(Header h, rpmTag nametag,
/* XXX there's no guarantee the ds is sorted here so rpmdsFind() wont do */
rpmdsInit(ads);
while (new && rpmdsNext(ads) >= 0) {
while (isnew && rpmdsNext(ads) >= 0) {
if (!rstreq(rpmdsN(ads), rpmdsN(bds))) continue;
if (!rstreq(rpmdsEVR(ads), rpmdsEVR(bds))) continue;
if (rpmdsFlags(ads) != rpmdsFlags(bds)) continue;
if (indextag && rpmtdSetIndex(&idx, rpmdsIx(ads)) >= 0 &&
rpmtdGetNumber(&idx) != index) continue;
new = 0;
isnew = 0;
}
if (indextag) {
@ -39,7 +39,7 @@ static int isNewDep(Header h, rpmTag nametag,
}
rpmdsFree(ads);
rpmdsFree(bds);
return new;
return isnew;
}
int addReqProv(Header h, rpmTag tagN,

4
build/rpmfc.c
View File

@ -999,7 +999,7 @@ struct DepMsg_s {
rpmTag vtag;
rpmTag ftag;
int mask;
int xor;
int xormask;
};
/**
@ -1070,7 +1070,7 @@ static void printDeps(Header h)
Flags = rpmdsFlags(ds);
if (!((Flags & dm->mask) ^ dm->xor))
if (!((Flags & dm->mask) ^ dm->xormask))
continue;
if (bingo == 0) {
rpmlog(RPMLOG_NOTICE, "%s:", (dm->msg ? dm->msg : ""));