From e1724c3d4ac040cd3bb6124df94e764338557475 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 30 May 2008 12:06:40 +0300 Subject: [PATCH] On a second thought, rename rpmfiDigest() to rpmfiFDigest() for consistency - it operates on current file of the set, not on the entire set so while changing API, name it similarly to other things that operate on current file --- lib/query.c | 2 +- lib/rpmfi.c | 14 +++++++------- lib/rpmfi.h | 2 +- lib/transaction.c | 2 +- lib/verify.c | 2 +- python/rpmfi-py.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/query.c b/lib/query.c index 8395f7b..391d43d 100644 --- a/lib/query.c +++ b/lib/query.c @@ -196,7 +196,7 @@ int showQueryPackage(QVA_t qva, rpmts ts, Header h) if (qva->qva_flags & QUERY_FOR_DUMPFILES) { char *add, *fdigest; size_t diglen = 0; - const unsigned char *digest = rpmfiDigest(fi, NULL, &diglen); + const unsigned char *digest = rpmfiFDigest(fi, NULL, &diglen); fdigest = pgpHexStr(digest, diglen); rasprintf(&add, "%s %d %d %s 0%o ", diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 028ccb3..c8dc23a 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -176,11 +176,11 @@ const unsigned char * rpmfiMD5(rpmfi fi) const unsigned char *digest; pgpHashAlgo algo = 0; - digest = rpmfiDigest(fi, &algo, NULL); + digest = rpmfiFDigest(fi, &algo, NULL); return (algo == PGPHASHALGO_MD5) ? digest : NULL; } -const unsigned char * rpmfiDigest(rpmfi fi, pgpHashAlgo *algo, size_t *len) +const unsigned char * rpmfiFDigest(rpmfi fi, pgpHashAlgo *algo, size_t *len) { const unsigned char *digest = NULL; @@ -473,8 +473,8 @@ int rpmfiCompare(const rpmfi afi, const rpmfi bfi) } else if (awhat == REG) { size_t adiglen, bdiglen; pgpHashAlgo aalgo, balgo; - const unsigned char * adigest = rpmfiDigest(afi, &aalgo, &adiglen); - const unsigned char * bdigest = rpmfiDigest(bfi, &balgo, &bdiglen); + const unsigned char * adigest = rpmfiFDigest(afi, &aalgo, &adiglen); + const unsigned char * bdigest = rpmfiFDigest(bfi, &balgo, &bdiglen); if (adigest == bdigest) return 0; if (adigest == NULL) return 1; if (bdigest == NULL) return -1; @@ -538,7 +538,7 @@ rpmFileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing) pgpHashAlgo oalgo, nalgo; size_t odiglen, ndiglen; const unsigned char * odigest, * ndigest; - odigest = rpmfiDigest(ofi, &oalgo, &odiglen); + odigest = rpmfiFDigest(ofi, &oalgo, &odiglen); if (diskWhat == REG) { if (rpmDoDigest(oalgo, fn, 0, (unsigned char *)buffer, NULL)) @@ -546,7 +546,7 @@ rpmFileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing) if (odigest && !memcmp(odigest, buffer, odiglen)) return FA_CREATE; /* unmodified config file, replace. */ } - ndigest = rpmfiDigest(nfi, &nalgo, &ndiglen); + ndigest = rpmfiFDigest(nfi, &nalgo, &ndiglen); /* XXX can't compare different hash types, what should we do here? */ if (oalgo != nalgo || odiglen != ndiglen) return FA_CREATE; @@ -600,7 +600,7 @@ int rpmfiConfigConflict(const rpmfi fi) if (newWhat == REG) { pgpHashAlgo algo; size_t diglen; - const unsigned char *ndigest = rpmfiDigest(fi, &algo, &diglen); + const unsigned char *ndigest = rpmfiFDigest(fi, &algo, &diglen); if (rpmDoDigest(algo, fn, 0, (unsigned char *)buffer, NULL)) return 0; /* assume file has been removed */ if (ndigest && !memcmp(ndigest, buffer, diglen)) diff --git a/lib/rpmfi.h b/lib/rpmfi.h index 12c7125..f7d24d9 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -213,7 +213,7 @@ rpmfileState rpmfiFState(rpmfi fi); * @retval diglen digest hash length (pass NULL to ignore) * @return current file digest, NULL on invalid */ -const unsigned char * rpmfiDigest(rpmfi fi, pgpHashAlgo *algo, size_t *diglen); +const unsigned char * rpmfiFDigest(rpmfi fi, pgpHashAlgo *algo, size_t *diglen); /** \ingroup rpmfi * Return current file (binary) md5 digest from file info set. diff --git a/lib/transaction.c b/lib/transaction.c index 9ae5b8f..c443b96 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -569,7 +569,7 @@ assert(otherFi != NULL); { pgpHashAlgo algo = 0; size_t diglen = 0; const unsigned char *digest; - if ((digest = rpmfiDigest(fi, &algo, &diglen))) { + if ((digest = rpmfiFDigest(fi, &algo, &diglen))) { unsigned char fdigest[diglen]; if (!rpmDoDigest(algo, fn, 0, fdigest, NULL) && memcmp(digest, fdigest, diglen)) { diff --git a/lib/verify.c b/lib/verify.c index 62e32ad..5ff05a8 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -97,7 +97,7 @@ int rpmVerifyFile(const rpmts ts, const rpmfi fi, size_t diglen; /* XXX If --nomd5, then prelinked library sizes are not corrected. */ - if ((digest = rpmfiDigest(fi, &algo, &diglen))) { + if ((digest = rpmfiFDigest(fi, &algo, &diglen))) { unsigned char fdigest[diglen]; rpm_off_t fsize; diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c index e11362d..bf68c45 100644 --- a/python/rpmfi-py.c +++ b/python/rpmfi-py.c @@ -91,14 +91,14 @@ rpmfi_FState(rpmfiObject * s) return Py_BuildValue("i", rpmfiFState(s->fi)); } -/* XXX rpmfiDigest */ +/* XXX rpmfiFDigest */ static PyObject * rpmfi_Digest(rpmfiObject * s) { const unsigned char *digest; size_t diglen = 0; - digest = rpmfiDigest(s->fi, NULL, &diglen); + digest = rpmfiFDigest(s->fi, NULL, &diglen); if (digest) { char *dig = pgpHexStr(digest, diglen); return Py_BuildValue("s", dig); -- 2.7.4