From fa818208abdc68d1bc77c44cc1b5c5a17ea8ffd2 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 12 Oct 2023 14:54:53 +0300 Subject: [PATCH] Eliminate remaining pgpValStr() uses in the codebase These are just rpmpgp.c internal uses but this makes it clearer these calls in pgpIdentItem() aren't doing anything special with the pgp value tables, it's just the same dumb algorithm name lookups as the three other usages in the codebase. No functional changes. --- rpmio/rpmpgp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index 45dd7ee6cf..0f18286378 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -56,8 +56,10 @@ char *pgpIdentItem(pgpDigParams digp) char *signid = rpmhex(pgpDigParamsSignID(digp) + 4, PGP_KEYID_LEN - 4); rasprintf(&id, _("V%d %s/%s %s, key ID %s"), pgpDigParamsVersion(digp), - pgpValStr(pgpPubkeyTbl, pgpDigParamsAlgo(digp, PGPVAL_PUBKEYALGO)), - pgpValStr(pgpHashTbl, pgpDigParamsAlgo(digp, PGPVAL_HASHALGO)), + pgpValString(PGPVAL_PUBKEYALGO, + pgpDigParamsAlgo(digp, PGPVAL_PUBKEYALGO)), + pgpValString(PGPVAL_HASHALGO, + pgpDigParamsAlgo(digp, PGPVAL_HASHALGO)), (pgpSignatureType(digp) == -1) ? "Public Key" : "Signature", signid); free(signid);