Rewrite headerGetN*() for simplicity

- eliminate stpcpy() games
- reuse evr formatting from headerGetEVR() instead of doing it over and
  over again everywhere

1 files changed, 21 insertions, 26 deletions

diff --git a/rpmdb/hdrNVR.c b/rpmdb/hdrNVR.c
index b329de18b..a7f36a301 100644
--- a/rpmdb/hdrNVR.c
+++ b/rpmdb/hdrNVR.c
@@ -56,40 +56,35 @@ int headerNEVRA(Header h, const char **np,
 
 char * headerGetNEVR(Header h, const char ** np)
 {
-    const char * n, * v, * r;
-    char * NVR, * t;
-
-    (void) headerNVR(h, &n, &v, &r);
-    NVR = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--"));
-    t = stpcpy(t, n);
-    t = stpcpy(t, "-");
-    t = stpcpy(t, v);
-    t = stpcpy(t, "-");
-    t = stpcpy(t, r);
+    const char * n;
+    char * evr, *nevr = NULL;
+
+    evr = headerGetEVR(h, &n);
+    rasprintf(&nevr, "%s-%s", n, evr);
+    free(evr);
     if (np)
 	*np = n;
-    return NVR;
+    return nevr;
 }
 
 char * headerGetNEVRA(Header h, const char ** np)
 {
-    const char * n, * v, * r, * a;
-    char * NVRA, * t;
-    int xx;
-
-    (void) headerNVR(h, &n, &v, &r);
-    xx = headerGetEntry(h, RPMTAG_ARCH, NULL, (rpm_data_t *) &a, NULL);
-    NVRA = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + strlen(a) + sizeof("--."));
-    t = stpcpy(t, n);
-    t = stpcpy(t, "-");
-    t = stpcpy(t, v);
-    t = stpcpy(t, "-");
-    t = stpcpy(t, r);
-    t = stpcpy(t, ".");
-    t = stpcpy(t, a);
+    const char *n, *a;
+    char *nevr, *nevra = NULL;
+
+    nevr = headerGetNEVR(h, &n);
+    headerGetEntry(h, RPMTAG_ARCH, NULL, (rpm_data_t *) &a, NULL);
+    /* XXX gpg-pubkey packages have no arch, urgh... */
+    if (a) {
+    	rasprintf(&nevra, "%s.%s", nevr, a);
+	free(nevr);
+    } else {
+	nevra = nevr;
+    }
+
     if (np)
 	*np = n;
-    return NVRA;
+    return nevra;
 }
 
 char * headerGetEVR(Header h, const char ** np)