RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   15-Nov-2007 16:13:07
  Branch: HEAD                             Handle: 2007111515130700

  Modified files:
    rpm/rpmio               rpmpgp.c

  Log:
    change implementation to match new header

  Summary:
    Revision    Changes     Path
    2.68        +6  -6      rpm/rpmio/rpmpgp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  ============================================================================
  $ cvs diff -u -r2.67 -r2.68 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c	14 Nov 2007 21:13:18 -0000	2.67
  +++ rpm/rpmio/rpmpgp.c	15 Nov 2007 15:13:07 -0000	2.68
  @@ -285,7 +285,7 @@
       return 0;
   }
   
  -int pgpPrtSubType(const byte *h, unsigned int hlen, pgpSigType sigtype)
  +int pgpPrtSubType(const byte *h, size_t hlen, pgpSigType sigtype)
   {
       const byte *p = h;
       unsigned plen;
  @@ -867,7 +867,7 @@
       return 0;
   }
   
  -int pgpPktLen(const byte *pkt, unsigned int pleft, pgpPkt pp)
  +int pgpPktLen(const byte *pkt, size_t pleft, pgpPkt pp)
   {
       unsigned int val = *pkt;
       unsigned int plen;
  @@ -897,7 +897,7 @@
       return pp->pktlen;
   }
   
  -int pgpPubkeyFingerprint(const byte * pkt, unsigned int pktlen, byte * keyid)
  +int pgpPubkeyFingerprint(const byte * pkt, size_t pktlen, byte * keyid)
   {
       pgpPkt pp = alloca(sizeof(*pp));
       int rc = pgpPktLen(pkt, pktlen, pp);
  @@ -964,7 +964,7 @@
       return 8;	/* no. of bytes of pubkey signid */
   }
   
  -int pgpPrtPkt(const byte *pkt, unsigned int pleft)
  +int pgpPrtPkt(const byte *pkt, size_t pleft)
   {
       pgpPkt pp = alloca(sizeof(*pp));
       int rc = pgpPktLen(pkt, pleft, pp);
  @@ -1261,13 +1261,13 @@
       return 0;
   }
   
  -int pgpPrtPkts(const byte * pkts, unsigned int pktlen, pgpDig dig, int printing)
  +int pgpPrtPkts(const byte * pkts, size_t pktlen, pgpDig dig, int printing)
   	/*@globals _dig, _digp, _print @*/
   	/*@modifies _dig, _digp, *_digp, _print @*/
   {
       pgpPkt pp = alloca(sizeof(*pp));
       unsigned int val = *pkts;
  -    unsigned int pleft;
  +    size_t pleft;
       int len;
       byte ** ppkts = NULL;
       int npkts;
  @@ .