RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm-4_5: rpm/lib/ rpmrc.c rpm/rpmio/ mire.h

From: Olivier Thauvin <nanardon@rpm5.org>
Date: Tue 03 Jul 2007 - 18:49:00 CEST
Message-Id: <20070703164900.943CB3484ED@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Olivier Thauvin
  Root:   /v/rpm/cvs                       Email:  nanardon@rpm5.org
  Module: rpm                              Date:   03-Jul-2007 18:49:00
  Branch: rpm-4_5                          Handle: 2007070317490000

  Modified files:           (Branch: rpm-4_5)
    rpm/lib                 rpmrc.c
    rpm/rpmio               mire.h

  Log:
    rpmlib.h expose some mire related function, and rpmPlatformScore() take
    it as argument. However the function to fill the structure is not exposed
    and so is likelly useless.
    This commit expose mireAppend in API and .h to allow any tools to perform
    a platorm comparison on an arbitrary list.

  Summary:
    Revision    Changes     Path
    2.195.2.3   +1  -1      rpm/lib/rpmrc.c
    1.2.2.1     +13 -0      rpm/rpmio/mire.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  ============================================================================
  $ cvs diff -u -r2.195.2.2 -r2.195.2.3 rpmrc.c
  --- rpm/lib/rpmrc.c	10 Jun 2007 17:12:25 -0000	2.195.2.2
  +++ rpm/lib/rpmrc.c	3 Jul 2007 16:49:00 -0000	2.195.2.3
  @@ -958,7 +958,7 @@
    * @retval *mi_nrep	no. of patterns in array
    */
   /*@null@*/
  -static int mireAppend(rpmMireMode mode, int tag, const char * pattern,
  +int mireAppend(rpmMireMode mode, int tag, const char * pattern,
   		miRE * mi_rep, int * mi_nrep)
   	/*@modifies *mi_rep, *mi_nrep @*/
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/mire.h
  ============================================================================
  $ cvs diff -u -r1.2 -r1.2.2.1 mire.h
  --- rpm/rpmio/mire.h	25 May 2007 18:34:14 -0000	1.2
  +++ rpm/rpmio/mire.h	3 Jul 2007 16:49:00 -0000	1.2.2.1
  @@ -111,6 +111,19 @@
   int mireRegcomp(miRE mire, const char * pattern)
   	/*@modifies mire @*/;
   
  +/**
  + * Append pattern to array.
  + * @param mode      type of pattern match
  + * @param tag       identifier (like an rpmTag)
  + * @param pattern   pattern to compile
  + * @retval *mi_rep  platform pattern array
  + * @retval *mi_nrep no. of patterns in array
  + */
  +int mireAppend(rpmMireMode mode, int tag, const char * pattern,
  +                miRE * mi_rep, int * mi_nrep)
  +	/*@modifies mire @*/;
  +
  +
   #ifdef __cplusplus
   }
   #endif
  @@ .
Received on Tue Jul 3 18:49:00 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.