Kill queryHeader(), it is not used and buggy

diff --git a/build/spec.c b/build/spec.c
index 15c8a5a..b73d01b 100644 (file)
--- a/build/spec.c
+++ b/build/spec.c
@@ -609,7 +609,6 @@ printNewSpecfile(rpmSpec spec)
        rasprintf(&fmt, "%%{%s}", tn);
        msgstr = _free(msgstr);
 
-       /* XXX this should use queryHeader(), but prints out tn as well. */
        msgstr = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr);
        if (msgstr == NULL) {
            rpmlog(RPMLOG_ERR, _("can't query %s: %s\n"), tn, errstr);

diff --git a/lib/query.c b/lib/query.c
index f91eac0..d642c80 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -102,19 +102,6 @@ static void printFileInfo(const char * name,
     perms = _free(perms);
 }
 
-/**
- */
-static inline char * queryHeader(Header h, const char * qfmt)
-{
-    const char * errstr;
-    char * str;
-
-    str = headerSprintf(h, qfmt, rpmTagTable, rpmHeaderFormats, &errstr);
-    if (str == NULL)
-       rpmlog(RPMLOG_ERR, _("incorrect format: %s\n"), errstr);
-    return str;
-}
-
 int showQueryPackage(QVA_t qva, rpmts ts, Header h)
 {
     int scareMem = 0;
@@ -123,10 +110,14 @@ int showQueryPackage(QVA_t qva, rpmts ts, Header h)
     int i;
 
     if (qva->qva_queryFormat != NULL) {
-       char * str = queryHeader(h, qva->qva_queryFormat);
-       if (str) {
+       const char *errstr;
+       char *str = headerSprintf(h, qva->qva_queryFormat, rpmTagTable, rpmHeaderFormats, &errstr);
+
+       if ( str != NULL ) {
            rpmlog(RPMLOG_NOTICE, "%s", str);
            free(str);
+       } else {
+           rpmlog(RPMLOG_ERR, _("incorrect format: %s\n"), errstr);
        }
     }