From 9ac127c35272772e0fc862608f4bde9748862b3d Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 7 Sep 2010 21:13:34 +0300 Subject: [PATCH] Mark ts argument unused in bunch of query APIs - The ts argument used to be necessary and used for rpmfiNew() and spec query but not any more... --- build/rpmspec.h | 2 +- build/spec.c | 2 +- lib/query.c | 6 +++--- lib/rpmcli.h | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/rpmspec.h b/build/rpmspec.h index 8b8ce3d..e712f19 100644 --- a/build/rpmspec.h +++ b/build/rpmspec.h @@ -138,7 +138,7 @@ rpmSpec rpmSpecFree(rpmSpec spec); /** \ingroup rpmbuild * Function to query spec file(s). - * @param ts transaction set + * @param ts (unused) * @param qva parsed query/verify options * @param arg query argument * @return 0 on success, else no. of failures diff --git a/build/spec.c b/build/spec.c index 1fc1554..f896b1c 100644 --- a/build/spec.c +++ b/build/spec.c @@ -347,7 +347,7 @@ int rpmspecQuery(rpmts ts, QVA_t qva, const char * arg) res = 0; for (Package pkg = spec->packages; pkg != NULL; pkg = pkg->next) - xx = qva->qva_showPackage(qva, ts, pkg->header); + xx = qva->qva_showPackage(qva, NULL, pkg->header); exit: spec = rpmSpecFree(spec); diff --git a/lib/query.c b/lib/query.c index f389967..d9a24a6 100644 --- a/lib/query.c +++ b/lib/query.c @@ -122,7 +122,7 @@ int showQueryPackage(QVA_t qva, rpmts ts, Header h) if (!(qva->qva_flags & QUERY_FOR_DUMPFILES)) fiflags |= RPMFI_NOFILEDIGESTS; - fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, fiflags); + fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, fiflags); if (rpmfiFC(fi) <= 0) { rpmlog(RPMLOG_NOTICE, _("(contains no files)\n")); goto exit; @@ -276,7 +276,7 @@ static int rpmgiShowMatches(QVA_t qva, rpmts ts) int rc; rpmdbCheckSignals(); - if ((rc = qva->qva_showPackage(qva, ts, h)) != 0) + if ((rc = qva->qva_showPackage(qva, NULL, h)) != 0) ec = rc; headerFree(h); } @@ -291,7 +291,7 @@ static int rpmcliShowMatches(QVA_t qva, rpmts ts) while ((h = rpmdbNextIterator(qva->qva_mi)) != NULL) { int rc; rpmdbCheckSignals(); - if ((rc = qva->qva_showPackage(qva, ts, h)) != 0) + if ((rc = qva->qva_showPackage(qva, NULL, h)) != 0) ec = rc; } qva->qva_mi = rpmdbFreeIterator(qva->qva_mi); diff --git a/lib/rpmcli.h b/lib/rpmcli.h index 2bd013e..61848bb 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -140,7 +140,7 @@ typedef struct rpmQVKArguments_s * QVA_t; * Function to display iterator matches. * * @param qva parsed query/verify options - * @param ts transaction set + * @param ts (unused) * @param h header to use for query/verify * @return 0 on success */ @@ -149,7 +149,7 @@ typedef int (*QVF_t) (QVA_t qva, rpmts ts, Header h); /** \ingroup rpmcli * Function to query spec file. * - * @param ts transaction set + * @param ts (unused) * @param qva parsed query/verify options * @param arg query argument * @return 0 on success @@ -220,7 +220,7 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg); * Display results of package query. * @todo Devise a meaningful return code. * @param qva parsed query/verify options - * @param ts transaction set + * @param ts (unused) * @param h header to use for query * @return 0 always */ -- 2.7.4