From 029615e1f688854db7184ee690cae244f7cee8e6 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 7 Sep 2010 22:02:53 +0300 Subject: [PATCH] Eliminate rpmQueryVerify() from librpm API - This is an inconsistent oddball interface which only works for limited query types, "cli" level API users are better off calling rpmcliQuery() / rpmcliArgIter() instead --- lib/query.c | 2 +- lib/rpmcli.h | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/query.c b/lib/query.c index f389967..07f4633 100644 --- a/lib/query.c +++ b/lib/query.c @@ -298,7 +298,7 @@ static int rpmcliShowMatches(QVA_t qva, rpmts ts) return ec; } -int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg) +static int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg) { int res = 0; const char * s; diff --git a/lib/rpmcli.h b/lib/rpmcli.h index 2bd013e..a548d61 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -203,20 +203,6 @@ extern struct poptOption rpmVerifyPoptTable[]; void rpmDisplayQueryTags(FILE * fp); /** \ingroup rpmcli - * Common query/verify source interface, called once for each CLI arg. - * - * This routine uses: - * - qva->qva_mi rpm database iterator - * - qva->qva_showPackage query/verify display routine - * - * @param qva parsed query/verify options - * @param ts transaction set - * @param arg name of source to query/verify - * @return showPackage() result, 1 if rpmdbInitIterator() is NULL - */ -int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg); - -/** \ingroup rpmcli * Display results of package query. * @todo Devise a meaningful return code. * @param qva parsed query/verify options -- 2.7.4