RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   08-Sep-2010 00:02:08
  Branch: HEAD                             Handle: 2010090722020701

  Modified files:
    rpm                     CHANGES
    rpm/lib                 query.c rpmcli.h

  Log:
    - rpm.org: git-v1:339f31face44d877c3a6e2fc780e740e7e236eae.

  Summary:
    Revision    Changes     Path
    1.3439      +1  -0      rpm/CHANGES
    2.216       +32 -1      rpm/lib/query.c
    2.100       +0  -15     rpm/lib/rpmcli.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3438 -r1.3439 CHANGES
  --- rpm/CHANGES	4 Sep 2010 18:26:55 -0000	1.3438
  +++ rpm/CHANGES	7 Sep 2010 22:02:07 -0000	1.3439
  @@ -1,4 +1,5 @@
   5.3.3 -> 5.4a1:
  +    - rpm.org: git-v1:339f31face44d877c3a6e2fc780e740e7e236eae.
       - jbj: rpmrepo: refactor the methods that don't need/use a header.
       - jbj: rpmrepo: handle all CLI argv processing in rpmrepoNew().
       - afb: tests: set up local magic path for internal file.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/query.c
  ============================================================================
  $ cvs diff -u -r2.215 -r2.216 query.c
  --- rpm/lib/query.c	13 Dec 2009 20:19:43 -0000	2.215
  +++ rpm/lib/query.c	7 Sep 2010 22:02:08 -0000	2.216
  @@ -30,6 +30,9 @@
   
   #include "debug.h"
   
  +static int _jbj;
  +#define	JBJDEBUG(_list)	if (_jbj) fprintf _list
  +
   /*@access rpmts @*/	/* XXX cast */
   
   /**
  @@ -183,6 +186,7 @@
       int rc = 0;		/* XXX FIXME: need real return code */
       int i;
   
  +JBJDEBUG((stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, qva, ts, h));
       te = t = xmalloc(tb);
       *te = '\0';
   
  @@ -382,6 +386,7 @@
       t = _free(t);
   
       fi = rpmfiFree(fi);
  +JBJDEBUG((stderr, "<-- %s(%p,%p,%p) rc %d\n", __FUNCTION__, qva, ts, h, rc));
       return rc;
   }
   
  @@ -393,6 +398,8 @@
       rpmRC rpmrc = RPMRC_NOTFOUND;
       int ec = 0;
   
  +JBJDEBUG((stderr, "--> %s(%p,%p)\n", __FUNCTION__, qva, ts));
  +
       while ((rpmrc = rpmgiNext(gi)) == RPMRC_OK) {
   	Header h;
   	int rc;
  @@ -411,14 +418,30 @@
       }
       if (ec == 0 && rpmrc == RPMRC_FAIL)
   	ec++;
  +
  +JBJDEBUG((stderr, "<-- %s(%p,%p) rc %d\n", __FUNCTION__, qva, ts, ec));
       return ec;
   }
   
  -int rpmcliShowMatches(QVA_t qva, rpmts ts)
  +/** \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
  + */
  +static int rpmcliShowMatches(QVA_t qva, rpmts ts)
  +	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
  +	/*@modifies qva, rpmGlobalMacroContext, fileSystem, internalState @*/
   {
       Header h;
       int ec = 1;
   
  +JBJDEBUG((stderr, "--> %s(%p,%p)\n", __FUNCTION__, qva, ts));
       qva->qva_showFAIL = qva->qva_showOK = 0;
       while ((h = rpmmiNext(qva->qva_mi)) != NULL) {
   	ec = qva->qva_showPackage(qva, ts, h);
  @@ -430,6 +453,7 @@
   	    break;
       }
       qva->qva_mi = rpmmiFree(qva->qva_mi);
  +JBJDEBUG((stderr, "<-- %s(%p,%p) rc %d\n", __FUNCTION__, qva, ts, ec));
       return ec;
   }
   
  @@ -457,6 +481,8 @@
       int i;
       int provides_checked = 0;
   
  +JBJDEBUG((stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, qva, ts, arg));
  +
       (void) rpmdbCheckSignals();
   
       if (qva->qva_showPackage == NULL)
  @@ -742,6 +768,7 @@
   	break;
       }
      
  +JBJDEBUG((stderr, "<-- %s(%p,%p,%p) rc %d\n", __FUNCTION__, qva, ts, arg, res));
       return res;
   }
   
  @@ -752,6 +779,7 @@
       rpmRC rpmrc = RPMRC_NOTFOUND;
       int ec = 0;
   
  +JBJDEBUG((stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, qva, argv));
       switch (qva->qva_source) {
       case RPMQV_ALL:
   	qva->qva_gi = rpmgiNew(ts, RPMDBI_PACKAGES, NULL, 0);
  @@ -847,6 +875,7 @@
   
       qva->qva_gi = rpmgiFree(qva->qva_gi);
   
  +JBJDEBUG((stderr, "<-- %s(%p,%p,%p) rc %d\n", __FUNCTION__, ts, qva, argv, ec));
       return ec;
   }
   
  @@ -857,6 +886,7 @@
       rpmVSFlags vsflags, ovsflags;
       int ec = 0;
   
  +JBJDEBUG((stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, qva, argv));
       if (qva->qva_showPackage == NULL)
   	qva->qva_showPackage = showQueryPackage;
   
  @@ -888,5 +918,6 @@
       if (qva->qva_showPackage == showQueryPackage)
   	qva->qva_showPackage = NULL;
   
  +JBJDEBUG((stderr, "<-- %s(%p,%p,%p) rc %d\n", __FUNCTION__, ts, qva, argv, ec));
       return ec;
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmcli.h
  ============================================================================
  $ cvs diff -u -r2.99 -r2.100 rpmcli.h
  --- rpm/lib/rpmcli.h	10 Feb 2010 20:24:50 -0000	2.99
  +++ rpm/lib/rpmcli.h	7 Sep 2010 22:02:08 -0000	2.100
  @@ -301,21 +301,6 @@
   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)
  -	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
  -	/*@modifies qva, rpmGlobalMacroContext, fileSystem, internalState @*/;
  -
  -/** \ingroup rpmcli
    * Common query/verify source interface, called once for each CLI arg.
    *
    * This routine uses:
  @@ .