Make queryformat array behavior consistent for all types

Always require matching number of elements regardless of data type
and number of elements, and error out otherwise. Behaving differently
for plain strings and binaries makes no sense, those checks are ancient
artifacts that have long since ceased to produce what might've been
originally intended behavior.

A remaining quirk is the case where a tag doesn't exist at all, this
produces (none)'s all the way down. Which doesn't seem terribly wrong,
but neither does it seem really consistent with the rest of it. Dunno.

1 files changed, 1 insertions, 7 deletions

diff --git a/lib/headerfmt.c b/lib/headerfmt.c
index 3f1880e5f..1f6390b5e 100644
--- a/lib/headerfmt.c
+++ b/lib/headerfmt.c
@@ -748,16 +748,10 @@ static char * singleSprintf(headerSprintfArgs hsa, sprintfToken token,
 	    found = 1;
 	    count = rpmtdCount(td);
 
-	    if (numElements > 1 && count != numElements)
-	    switch (td->type) {
-	    default:
+	    if (numElements > 0 && count != numElements) {
 		hsaError(hsa,
 			_("array iterator used with different sized arrays"));
 		return NULL;
-		break;
-	    case RPM_BIN_TYPE:
-	    case RPM_STRING_TYPE:
-		break;
 	    }
 	    if (count > numElements)
 		numElements = count;