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

Simplify findTag()

This commit is contained in:
Jindrich Novy 2011-04-28 13:22:41 +02:00
parent b19a896ecd
commit ffae32e463
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/headerfmt.c
View File

@ -233,23 +233,17 @@ static int findTag(headerSprintfArgs hsa, sprintfToken token, const char * name)
stag->fmt = NULL;
stag->tag = RPMTAG_NOT_FOUND;
if (rstreq(tagname, "*")) {
stag->tag = -2;
goto bingo;
}
if (!rstreq(tagname, "*")) {
if (rstreqn("RPMTAG_", tagname, sizeof("RPMTAG_")-1)) {
tagname += sizeof("RPMTAG");
}
if (rstreqn("RPMTAG_", tagname, sizeof("RPMTAG_")-1)) {
tagname += sizeof("RPMTAG");
}
/* Search tag names. */
stag->tag = rpmTagGetValue(tagname);
if (stag->tag == RPMTAG_NOT_FOUND) return 1;
/* Search tag names. */
stag->tag = rpmTagGetValue(tagname);
if (stag->tag != RPMTAG_NOT_FOUND)
goto bingo;
} else stag->tag = -2;
return 1;
bingo:
/* Search extensions for specific format. */
if (stag->type != NULL)
stag->fmt = rpmHeaderFormatFuncByName(stag->type);