Simplify findTag()

diff --git a/lib/headerfmt.c b/lib/headerfmt.c
index 49c7047..4a41435 100644 (file)
--- a/lib/headerfmt.c
+++ b/lib/headerfmt.c
@@ -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 (rstreqn("RPMTAG_", tagname, sizeof("RPMTAG_")-1)) {
-       tagname += sizeof("RPMTAG");
-    }
+    if (!rstreq(tagname, "*")) {
+       if (rstreqn("RPMTAG_", tagname, sizeof("RPMTAG_")-1)) {
+           tagname += sizeof("RPMTAG");
+       }
 
-    /* Search tag names. */
-    stag->tag = rpmTagGetValue(tagname);
-    if (stag->tag != RPMTAG_NOT_FOUND)
-       goto bingo;
+       /* Search tag names. */
+       stag->tag = rpmTagGetValue(tagname);
+       if (stag->tag == RPMTAG_NOT_FOUND) return 1;
 
-    return 1;
+    } else stag->tag = -2;
 
-bingo:
     /* Search extensions for specific format. */
     if (stag->type != NULL)
        stag->fmt = rpmHeaderFormatFuncByName(stag->type);