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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   30-Jul-2007 04:28:13
  Branch: rpm-4_5                          Handle: 2007073003281300

  Modified files:           (Branch: rpm-4_5)
    rpm/lib                 signature.c
    rpm/rpmdb               legacy.c
    rpm/rpmio               digest.c rpmpgp.h tkey.c

  Log:
    eliminate void ** in rpmDigestFinal.

  Summary:
    Revision    Changes     Path
    2.161.2.4   +2  -2      rpm/lib/signature.c
    1.25.2.2    +1  -1      rpm/rpmdb/legacy.c
    2.30.2.1    +3  -3      rpm/rpmio/digest.c
    2.43.2.1    +3  -3      rpm/rpmio/rpmpgp.h
    2.15.8.1    +1  -1      rpm/rpmio/tkey.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/signature.c
  ============================================================================
  $ cvs diff -u -r2.161.2.3 -r2.161.2.4 signature.c
  --- rpm/lib/signature.c	9 Jun 2007 19:08:50 -0000	2.161.2.3
  +++ rpm/lib/signature.c	30 Jul 2007 02:28:13 -0000	2.161.2.4
  @@ -1313,7 +1313,7 @@
   	}
   #endif
   
  -	xx = rpmDigestFinal(ctx, (void **)&dig->md5, &dig->md5len, 1);
  +	xx = rpmDigestFinal(ctx, &dig->md5, &dig->md5len, 1);
   	(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DIGEST), sigp->hashlen);
   	rpmtsOp(ts, RPMTS_OP_DIGEST)->count--;	/* XXX one too many */
   
  @@ -1446,7 +1446,7 @@
   	    memcpy(trailer+2, &nb, sizeof(nb));
   	    xx = rpmDigestUpdate(ctx, trailer, sizeof(trailer));
   	}
  -	xx = rpmDigestFinal(ctx, (void **)&dig->sha1, &dig->sha1len, 1);
  +	xx = rpmDigestFinal(ctx, &dig->sha1, &dig->sha1len, 1);
   	(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DIGEST), sigp->hashlen);
   	rpmtsOp(ts, RPMTS_OP_DIGEST)->count--;	/* XXX one too many */
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/legacy.c
  ============================================================================
  $ cvs diff -u -r1.25.2.1 -r1.25.2.2 legacy.c
  --- rpm/rpmdb/legacy.c	9 Jun 2007 19:08:53 -0000	1.25.2.1
  +++ rpm/rpmdb/legacy.c	30 Jul 2007 02:28:13 -0000	1.25.2.2
  @@ -203,7 +203,7 @@
   	ctx = rpmDigestInit(digestalgo, RPMDIGEST_NONE);
   	if (fsize)
   	    xx = rpmDigestUpdate(ctx, mapped, fsize);
  -	xx = rpmDigestFinal(ctx, (void **)&dsum, &dlen, asAscii);
  +	xx = rpmDigestFinal(ctx, &dsum, &dlen, asAscii);
   	if (fsize)
   	    xx = munmap(mapped, fsize);
   	xx = close(fdno);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/digest.c
  ============================================================================
  $ cvs diff -u -r2.30 -r2.30.2.1 digest.c
  --- rpm/rpmio/digest.c	25 May 2007 17:36:36 -0000	2.30
  +++ rpm/rpmio/digest.c	30 Jul 2007 02:28:13 -0000	2.30.2.1
  @@ -658,7 +658,7 @@
   
   /*@-boundswrite@*/
   int
  -rpmDigestFinal(DIGEST_CTX ctx, void ** datap, size_t *lenp, int asAscii)
  +rpmDigestFinal(DIGEST_CTX ctx, void * datap, size_t *lenp, int asAscii)
   {
       byte * digest;
       char * t;
  @@ -678,7 +678,7 @@
       if (!asAscii) {
   	if (lenp) *lenp = ctx->digestsize;
   	if (datap) {
  -	    *datap = digest;
  +	    *(byte **)datap = digest;
   	    digest = NULL;
   	}
       } else {
  @@ -687,7 +687,7 @@
   	    const byte * s = (const byte *) digest;
   	    static const char hex[] = "0123456789abcdef";
   
  -	    *datap = t = xmalloc((2*ctx->digestsize) + 1);
  +	    *(char **)datap = t = xmalloc((2*ctx->digestsize) + 1);
   	    for (i = 0 ; i < ctx->digestsize; i++) {
   		*t++ = hex[ (unsigned)((*s >> 4) & 0x0f) ];
   		*t++ = hex[ (unsigned)((*s++   ) & 0x0f) ];
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.h
  ============================================================================
  $ cvs diff -u -r2.43 -r2.43.2.1 rpmpgp.h
  --- rpm/rpmio/rpmpgp.h	25 May 2007 17:36:37 -0000	2.43
  +++ rpm/rpmio/rpmpgp.h	30 Jul 2007 02:28:13 -0000	2.43.2.1
  @@ -1465,13 +1465,13 @@
    * 1 0* (64-bit count of bits processed, MSB-first)
    *
    * @param ctx		digest context
  - * @retval datap	address of returned digest
  - * @retval lenp		address of digest length
  + * @retval *datap	returned digest
  + * @retval *lenp	digest length
    * @param asAscii	return digest as ascii string?
    * @return		0 on success
    */
   int rpmDigestFinal(/*@only@*/ /*@null@*/ DIGEST_CTX ctx,
  -	/*@null@*/ /*@out@*/ void ** datap,
  +	/*@null@*/ /*@out@*/ void * datap,
   	/*@null@*/ /*@out@*/ size_t * lenp, int asAscii)
   		/*@modifies *datap, *lenp @*/;
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tkey.c
  ============================================================================
  $ cvs diff -u -r2.15 -r2.15.8.1 tkey.c
  --- rpm/rpmio/tkey.c	25 Apr 2003 20:46:38 -0000	2.15
  +++ rpm/rpmio/tkey.c	30 Jul 2007 02:28:13 -0000	2.15.8.1
  @@ -150,7 +150,7 @@
   	
   	rpmDigestUpdate(ctx, txt, strlen(txt));
   	rpmDigestUpdate(ctx, dsig->hash, dsig->hashlen);
  -	rpmDigestFinal(ctx, (void **)&digest, &digestlen, 1);
  +	rpmDigestFinal(ctx, &digest, &digestlen, 1);
   
   	mpnzero(&dig->hm); mpnsethex(&dig->hm, digest);
   
  @@ .