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:   22-Nov-2007 20:50:19
  Branch: HEAD                             Handle: 2007112219501701

  Modified files:
    rpm                     CHANGES
    rpm/build               files.c
    rpm/rpmdb               hdrinline.h header.c header.h

  Log:
    - eliminate hRET_t, use rpmTagData instead.
    - fix: files.c: pass union ptr, not 1st element, address.

  Summary:
    Revision    Changes     Path
    1.1869      +2  -0      rpm/CHANGES
    1.290       +1  -1      rpm/build/files.c
    1.37        +3  -4      rpm/rpmdb/hdrinline.h
    1.126       +3  -3      rpm/rpmdb/header.c
    1.70        +3  -4      rpm/rpmdb/header.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1868 -r1.1869 CHANGES
  --- rpm/CHANGES	22 Nov 2007 19:27:13 -0000	1.1868
  +++ rpm/CHANGES	22 Nov 2007 19:50:17 -0000	1.1869
  @@ -1,4 +1,6 @@
   5.0a2 -> 5.0a3:
  +    - jbj: eliminate hRET_t, use rpmTagData instead.
  +    - jbj: fix: files.c: pass union ptr, not 1st element, address.
       - jbj: eliminate hTYP_t and hCNT_t typedefs everywhere.
       - jbj: fix: python: pass pgpDig, not rpmts, as 1st arg to  headerCheck.
       - jbj: fix: python: include pkgio.h for rpmpkgRead prototype.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/files.c
  ============================================================================
  $ cvs diff -u -r1.289 -r1.290 files.c
  --- rpm/build/files.c	19 Nov 2007 17:07:46 -0000	1.289
  +++ rpm/build/files.c	22 Nov 2007 19:50:18 -0000	1.290
  @@ -2536,7 +2536,7 @@
       /*@-branchstate@*/
     if (!spec->sourceHdrInit) {
       for (hi = headerInitIterator(spec->packages->header);
  -	headerNextIterator(hi, &he->tag, &he->t, &he->p.ptr, &he->c);
  +	headerNextIterator(hi, &he->tag, &he->t, &he->p, &he->c);
   	he->p.ptr = headerFreeData(he->p.ptr, he->t))
       {
   	switch (he->tag) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrinline.h
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 hdrinline.h
  --- rpm/rpmdb/hdrinline.h	22 Nov 2007 19:27:14 -0000	1.36
  +++ rpm/rpmdb/hdrinline.h	22 Nov 2007 19:50:18 -0000	1.37
  @@ -363,7 +363,7 @@
   /*@unused@*/ static inline
   int headerGetEntry(Header h, uint32_t tag,
   			/*@null@*/ /*@out@*/ rpmTagType * type,
  -			/*@null@*/ /*@out@*/ hRET_t * p,
  +			/*@null@*/ /*@out@*/ rpmTagData * p,
   			/*@null@*/ /*@out@*/ rpmTagCount * c)
   	/*@modifies *type, *p, *c @*/
   {
  @@ -568,12 +568,11 @@
   int headerNextIterator(HeaderIterator hi,
   		/*@null@*/ /*@out@*/ hTAG_t tag,
   		/*@null@*/ /*@out@*/ rpmTagType * type,
  -		/*@null@*/ /*@out@*/ const void * p,
  +		/*@null@*/ /*@out@*/ rpmTagData * p,
   		/*@null@*/ /*@out@*/ rpmTagCount * c)
   	/*@modifies hi, *tag, *type, *p, *c @*/
   {
  -    hRET_t **q = (void *)&p;
  -    return hdrVec->hdrnextiter(hi, tag, type, *q, c);
  +    return hdrVec->hdrnextiter(hi, tag, type, p, c);
   }
   
   /** \ingroup header
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  ============================================================================
  $ cvs diff -u -r1.125 -r1.126 header.c
  --- rpm/rpmdb/header.c	22 Nov 2007 19:27:14 -0000	1.125
  +++ rpm/rpmdb/header.c	22 Nov 2007 19:50:18 -0000	1.126
  @@ -1758,7 +1758,7 @@
   static
   int headerGetExtension(Header h, uint32_t tag,
   			/*@null@*/ /*@out@*/ rpmTagType * type,
  -			/*@null@*/ /*@out@*/ hRET_t * p,
  +			/*@null@*/ /*@out@*/ rpmTagData * p,
   			/*@null@*/ /*@out@*/ rpmTagCount * c)
   	/*@globals headerCompoundFormats @*/
   	/*@modifies *type, *p, *c @*/
  @@ -1863,7 +1863,7 @@
   static
   int headerGetEntry(Header h, uint32_t tag,
   			/*@null@*/ /*@out@*/ rpmTagType * type,
  -			/*@null@*/ /*@out@*/ hRET_t * p,
  +			/*@null@*/ /*@out@*/ rpmTagData * p,
   			/*@null@*/ /*@out@*/ rpmTagCount * c)
   	/*@modifies *type, *p, *c @*/
   	/*@requires maxSet(type) >= 0 /\ maxSet(p) >= 0 /\ maxSet(c) >= 0 @*/
  @@ -2428,7 +2428,7 @@
   int headerNextIterator(HeaderIterator hi,
   		/*@null@*/ /*@out@*/ hTAG_t tag,
   		/*@null@*/ /*@out@*/ rpmTagType * type,
  -		/*@null@*/ /*@out@*/ hRET_t * p,
  +		/*@null@*/ /*@out@*/ rpmTagData * p,
   		/*@null@*/ /*@out@*/ rpmTagCount * c)
   	/*@modifies hi, *tag, *type, *p, *c @*/
   	/*@requires maxSet(tag) >= 0 /\ maxSet(type) >= 0
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.h
  ============================================================================
  $ cvs diff -u -r1.69 -r1.70 header.h
  --- rpm/rpmdb/header.h	22 Nov 2007 19:27:14 -0000	1.69
  +++ rpm/rpmdb/header.h	22 Nov 2007 19:50:18 -0000	1.70
  @@ -137,7 +137,6 @@
   /** \ingroup header
    */
   /*@-typeuse -fielduse@*/
  -typedef union rpmDataType_u hRET_t;
   #if !defined(SWIG)
   union rpmDataType_u {
   /*@null@*/
  @@ -535,7 +534,7 @@
   typedef
   int (*HDRext) (Header h, uint32_t tag,
   			/*@null@*/ /*@out@*/ rpmTagType * type,
  -			/*@null@*/ /*@out@*/ hRET_t * p,
  +			/*@null@*/ /*@out@*/ rpmTagData * p,
   			/*@null@*/ /*@out@*/ rpmTagCount * c)
   	/*@modifies *type, *p, *c @*/;
   
  @@ -555,7 +554,7 @@
   typedef
   int (*HDRget) (Header h, uint32_t tag,
   			/*@null@*/ /*@out@*/ rpmTagType * type,
  -			/*@null@*/ /*@out@*/ hRET_t * p,
  +			/*@null@*/ /*@out@*/ rpmTagData * p,
   			/*@null@*/ /*@out@*/ rpmTagCount * c)
   	/*@modifies *type, *p, *c @*/;
   
  @@ -718,7 +717,7 @@
   int (*HDRnextiter) (HeaderIterator hi,
   		/*@null@*/ /*@out@*/ hTAG_t tag,
   		/*@null@*/ /*@out@*/ rpmTagType * type,
  -		/*@null@*/ /*@out@*/ hRET_t * p,
  +		/*@null@*/ /*@out@*/ rpmTagData * p,
   		/*@null@*/ /*@out@*/ rpmTagCount * c)
   	/*@modifies hi, *tag, *type, *p, *c @*/;
   
  @@ .