RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/rpmio/ rpmpgp.c

From: Ralf S. Engelschall <rse@rpm5.org>
Date: Tue 10 Jul 2007 - 18:56:49 CEST
Message-Id: <20070710165649.4C4543484F1@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   10-Jul-2007 18:56:49
  Branch: HEAD                             Handle: 2007071017564900

  Modified files:
    rpm/rpmio               rpmpgp.c

  Log:
    b64decode deals with size_t and pgpPubkeyFingerprint deals with
    'unsigned int', so make it explicit and avoid that at least one
    coersion from 'size_t' causes a warning. Also explicitly cast the
    size_t argument to 'unsigned int' as one cannot assume that size_t is
    an 'unsigned int' (it could be an 'unsigned long' or whatever --
    that's abstraction)

  Summary:
    Revision    Changes     Path
    2.54        +2  -2      rpm/rpmio/rpmpgp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  ============================================================================
  $ cvs diff -u -r2.53 -r2.54 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c	29 Jun 2007 12:33:08 -0000	2.53
  +++ rpm/rpmio/rpmpgp.c	10 Jul 2007 16:56:49 -0000	2.54
  @@ -962,11 +962,11 @@
   int pgpExtractPubkeyFingerprint(const char * b64pkt, byte * keyid)
   {
       const byte * pkt;
  -    ssize_t pktlen;
  +    size_t pktlen;
   
       if (b64decode(b64pkt, (void **)&pkt, &pktlen))
   	return -1;	/* on error */
  -    (void) pgpPubkeyFingerprint(pkt, pktlen, keyid);
  +    (void) pgpPubkeyFingerprint(pkt, (unsigned int)pktlen, keyid);
       pkt = _free(pkt);
       return 8;	/* no. of bytes of pubkey signid */
   }
  @@ .
Received on Tue Jul 10 18:56:49 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.