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 21:04:55
  Branch: HEAD                             Handle: 2007071020045401

  Modified files:
    rpm/build               files.c parseSpec.c rpmbuild.h
    rpm/lib                 rpmrc.c
    rpm/rpmio               rpmio.c rpmio_internal.h rpmpgp.c

  Log:
    remove the remaining warnings we can still eliminate rather 'easily'
    by cleaning up the code

  Summary:
    Revision    Changes     Path
    1.248       +3  -3      rpm/build/files.c
    2.101       +1  -1      rpm/build/parseSpec.c
    2.71        +1  -1      rpm/build/rpmbuild.h
    2.206       +2  -2      rpm/lib/rpmrc.c
    1.90        +1  -1      rpm/rpmio/rpmio.c
    2.76        +1  -1      rpm/rpmio/rpmio_internal.h
    2.55        +1  -1      rpm/rpmio/rpmpgp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/build/files.c
  ============================================================================
  $ cvs diff -u -r1.247 -r1.248 files.c
  --- rpm/build/files.c	10 Jul 2007 18:48:13 -0000	1.247
  +++ rpm/build/files.c	10 Jul 2007 19:04:54 -0000	1.248
  @@ -1960,8 +1960,8 @@
       const char * buildURL = "%{_builddir}/%{?buildsubdir}/";
       const char * fn = NULL;
       const char * apkt = NULL;
  -    const unsigned char * pkt = NULL;
  -    size_t pktlen = 0;
  +    byte * pkt = NULL;
  +    ssize_t pktlen = 0;
       int absolute = 0;
       int rc = 1;
       int xx;
  @@ -1981,7 +1981,7 @@
   	goto exit;
   	/*@notreached@*/ break;
       case RPMTAG_PUBKEYS:
  -	if ((rc = pgpReadPkts(fn, &pkt, &pktlen)) <= 0) {
  +	if ((rc = pgpReadPkts(fn, (const byte **)&pkt, (size_t *)&pktlen)) <= 0) {
   	    rpmError(RPMERR_BADSPEC, _("%s: public key read failed.\n"), fn);
   	    goto exit;
   	}
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parseSpec.c
  ============================================================================
  $ cvs diff -u -r2.100 -r2.101 parseSpec.c
  --- rpm/build/parseSpec.c	25 May 2007 17:35:56 -0000	2.100
  +++ rpm/build/parseSpec.c	10 Jul 2007 19:04:54 -0000	2.101
  @@ -432,7 +432,7 @@
   /*@-boundswrite@*/
   int parseSpec(rpmts ts, const char *specFile, const char *rootURL,
   		int recursing, const char *passPhrase,
  -		char *cookie, int anyarch, int force, int verify)
  +		const char *cookie, int anyarch, int force, int verify)
   {
       rpmParseState parsePart = PART_PREAMBLE;
       int initialPackage = 1;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/rpmbuild.h
  ============================================================================
  $ cvs diff -u -r2.70 -r2.71 rpmbuild.h
  --- rpm/build/rpmbuild.h	25 May 2007 17:35:56 -0000	2.70
  +++ rpm/build/rpmbuild.h	10 Jul 2007 19:04:54 -0000	2.71
  @@ -510,7 +510,7 @@
   		/*@null@*/ const char * rootURL,
   		int recursing,
   		/*@null@*/ const char * passPhrase,
  -		/*@null@*/ char * cookie,
  +		/*@null@*/ const char * cookie,
   		int anyarch, int force, int verify)
   	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
   	/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  ============================================================================
  $ cvs diff -u -r2.205 -r2.206 rpmrc.c
  --- rpm/lib/rpmrc.c	9 Jul 2007 22:31:56 -0000	2.205
  +++ rpm/lib/rpmrc.c	10 Jul 2007 19:04:55 -0000	2.206
  @@ -440,7 +440,7 @@
   		rpmGlobalMacroContext, fileSystem, internalState @*/
   {
       CVOG_t cvog = NULL;
  -    char * b = NULL;
  +    byte * b = NULL;
       ssize_t blen = 0;
       int init_platform = 0;
       miRE mi_re = NULL;
  @@ -456,7 +456,7 @@
   	goto exit;
       }
   
  -    p = b;
  +    p = (char *)b;
       for (pe = p; p && *p; p = pe) {
   	pe = strchr(p, '\n');
   	if (pe)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  ============================================================================
  $ cvs diff -u -r1.89 -r1.90 rpmio.c
  --- rpm/rpmio/rpmio.c	10 Jul 2007 12:15:19 -0000	1.89
  +++ rpm/rpmio/rpmio.c	10 Jul 2007 19:04:55 -0000	1.90
  @@ -3891,7 +3891,7 @@
   }
   
   /*@-boundswrite@*/
  -int rpmioSlurp(const char * fn, const byte ** bp, ssize_t * blenp)
  +int rpmioSlurp(const char * fn, byte ** bp, ssize_t * blenp)
   {
       static ssize_t blenmax = (32 * BUFSIZ);
       ssize_t blen = 0;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio_internal.h
  ============================================================================
  $ cvs diff -u -r2.75 -r2.76 rpmio_internal.h
  --- rpm/rpmio/rpmio_internal.h	24 Jun 2007 10:27:21 -0000	2.75
  +++ rpm/rpmio/rpmio_internal.h	10 Jul 2007 19:04:55 -0000	2.76
  @@ -674,7 +674,7 @@
    * @return		0 on success
    */
   int rpmioSlurp(const char * fn,
  -                /*@out@*/ const unsigned char ** bp, /*@out@*/ ssize_t * blenp)
  +                /*@out@*/ byte ** bp, /*@out@*/ ssize_t * blenp)
           /*@globals h_errno, fileSystem, internalState @*/
           /*@modifies *bp, *blenp, fileSystem, internalState @*/;
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  ============================================================================
  $ cvs diff -u -r2.54 -r2.55 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c	10 Jul 2007 16:56:49 -0000	2.54
  +++ rpm/rpmio/rpmpgp.c	10 Jul 2007 19:04:55 -0000	2.55
  @@ -1220,7 +1220,7 @@
   /*@-boundswrite@*/
   pgpArmor pgpReadPkts(const char * fn, const byte ** pkt, size_t * pktlen)
   {
  -    const byte * b = NULL;
  +    byte * b = NULL;
       ssize_t blen;
       const char * enc = NULL;
       const char * crcenc = NULL;
  @@ .