summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-09-07 22:02:53 +0300
committerPanu Matilainen <pmatilai@redhat.com>2010-09-08 07:50:23 +0300
commit029615e1f688854db7184ee690cae244f7cee8e6 (patch)
treea4753a6a0ec6e765c40b1992d7c4fb2e61f64bdd
parentb71818080b7481fbc4ca95bd95eb7d80c67a7cb4 (diff)
downloadrpm-029615e1f688854db7184ee690cae244f7cee8e6.tar.gz
rpm-029615e1f688854db7184ee690cae244f7cee8e6.tar.bz2
rpm-029615e1f688854db7184ee690cae244f7cee8e6.zip
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
-rw-r--r--lib/query.c2
-rw-r--r--lib/rpmcli.h14
2 files changed, 1 insertions, 15 deletions
diff --git a/lib/query.c b/lib/query.c
index f389967a7..07f4633df 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 2bd013e37..a548d613e 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