[Rpm-maint] [PATCH] Making showQueryPackage, rpmcliShowMatches & rpmQueryVerify static in query.c .

[Rakesh Pandit]

Saves us 3 function symbols from exporting.

Link: http://rakesh.fedorapeople.org/rpm/0007-Making-showQueryPackage-rpmcliShowMatches-rpmQuer.patch

In series with http://rakesh.fedorapeople.org/rpm/0006-Handle-q-query-with-extention-.rpm-and-query-them-a.patch

Review?

--
Regards,
Rakesh

>From c3b22a6afe54f80bb94cf0bc521617a75261a5d4 Mon Sep 17 00:00:00 2001
From: Rakesh Pandit <rakesh at fedoraproject.org>
Date: Thu, 28 May 2009 03:41:56 +0530
Subject: [PATCH] Making showQueryPackage, rpmcliShowMatches &
rpmQueryVerify static in query.c .

---
 lib/query.c  |    7 +++----
 lib/rpmcli.h |   37 -------------------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/lib/query.c b/lib/query.c
index 5d06952..f29873e 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -96,7 +96,7 @@ static void printFileInfo(const char * name,
     free(link);
 }

-int showQueryPackage(QVA_t qva, rpmts ts, Header h)
+static int showQueryPackage(QVA_t qva, rpmts ts, Header h)
 {
     rpmfi fi = NULL;
     rpmfiFlags fiflags =  (RPMFI_NOHEADER | RPMFI_FLAGS_QUERY);
@@ -286,7 +286,7 @@ static int rpmgiShowMatches(QVA_t qva, rpmts ts)
     return rpmgiNumErrors(gi);
 }

-int rpmcliShowMatches(QVA_t qva, rpmts ts)
+static int rpmcliShowMatches(QVA_t qva, rpmts ts)
 {
     Header h;
     int ec = 0;
@@ -303,8 +303,7 @@ int rpmcliShowMatches(QVA_t qva, rpmts ts)
     return ec;
 }

-/* LCL: segfault (realpath annotation?) */
-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 4b52e0a..c51fc46 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -216,49 +216,12 @@ extern struct poptOption rpmQueryPoptTable[];
 extern struct poptOption rpmVerifyPoptTable[];

 /** \ingroup rpmcli
- * Display query/verify information for each header in iterator.
- *
- * 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
- * @return		result of last non-zero showPackage() return
- */
-int rpmcliShowMatches(QVA_t qva, rpmts ts);
-
-/** \ingroup rpmcli
  * Display list of tags that can be used in --queryformat.
  * @param fp	file handle to use for display
  */
 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
- * @param ts		transaction set
- * @param h		header to use for query
- * @return		0 always
- */
-int showQueryPackage(QVA_t qva, rpmts ts, Header h);
-
-/** \ingroup rpmcli
  * Iterate over query/verify arg list.
  * @param ts		transaction set
  * @param qva		parsed query/verify options
-- 
1.6.0.6