headerNextTag() fits the checkForDuplicates() use-case better

- as we're only looking at tags, not their contents... avoid unnecessary
  data shuffling and the code is a little simpler too

1 files changed, 5 insertions, 9 deletions

diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 1a0e79dcd..a4a875040 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -274,20 +274,16 @@ static int checkForRequired(Header h, const char * NVR)
 static int checkForDuplicates(Header h, const char * NVR)
 {
     int res = RPMRC_OK;
-    rpmTag lastTag, tag;
-    HeaderIterator hi;
-    struct rpmtd_s td;
-    
-    for (hi = headerInitIterator(h), lastTag = 0;
-	headerNext(hi, &td), tag = rpmtdTag(&td);
-	lastTag = tag)
-    {
+    rpmTag tag, lastTag = RPMTAG_NOT_FOUND;
+    HeaderIterator hi = headerInitIterator(h);
+
+    while ((tag = headerNextTag(hi)) != RPMTAG_NOT_FOUND) {
 	if (tag == lastTag) {
 	    rpmlog(RPMLOG_ERR, _("Duplicate %s entries in package: %s\n"),
 		     rpmTagGetName(tag), NVR);
 	    res = RPMRC_FAIL;
 	}
-	rpmtdFreeData(&td);
+	lastTag = tag;
     }
     hi = headerFreeIterator(hi);