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:   23-Nov-2007 06:34:09
  Branch: HEAD                             Handle: 2007112305340801

  Modified files:
    rpm                     CHANGES
    rpm/rpmdb               rpmtag.h

  Log:
    - eliminate (unused) hPTR_t.

  Summary:
    Revision    Changes     Path
    1.1872      +1  -0      rpm/CHANGES
    1.7         +27 -31     rpm/rpmdb/rpmtag.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1871 -r1.1872 CHANGES
  --- rpm/CHANGES	23 Nov 2007 00:29:47 -0000	1.1871
  +++ rpm/CHANGES	23 Nov 2007 05:34:08 -0000	1.1872
  @@ -1,4 +1,5 @@
   5.0a2 -> 5.0a3:
  +    - jbj: eliminate (unused) hPTR_t.
       - jbj: hmm, a memory leak, add doco to the TODO file.
       - jbj: eliminate hTAG_t, use "rpmTag *" instead.
       - jbj: drill rpmTag everywhere needed in header methods.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmtag.h
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 rpmtag.h
  --- rpm/rpmdb/rpmtag.h	23 Nov 2007 00:29:47 -0000	1.6
  +++ rpm/rpmdb/rpmtag.h	23 Nov 2007 05:34:09 -0000	1.7
  @@ -40,19 +40,19 @@
   
   /** \ingroup header
    */
  -typedef enum rpmTagType_e rpmTagType;
  +typedef enum rpmTagType_e rpmTagType;	/*!< tag data type. */
   
   /** \ingroup header
    */
  -typedef union rpmDataType_u rpmTagData;
  +typedef union rpmDataType_u rpmTagData;	/*!< tag data. */
   
   /** \ingroup header
    */
  -typedef uint32_t rpmTagCount;
  +typedef uint32_t rpmTagCount;	/*!< tag data element count. */
   
   /** \ingroup header
    */
  -typedef struct _HE_s * HE_t;		/* tag container. */
  +typedef struct _HE_s * HE_t;	/*!< tag container. */
   
   /** \ingroup header
    */
  @@ -61,10 +61,10 @@
   union rpmDataType_u {
   /*@null@*/
       void * ptr;
  -    uint8_t * ui8p;		/*!< RPM_INT8_TYPE | RPM_CHAR_TYPE */
  -    uint16_t * ui16p;		/*!< RPM_INT16_TYPE */
  -    uint32_t * ui32p;		/*!< RPM_INT32_TYPE */
  -    uint64_t * ui64p;		/*!< RPM_INT64_TYPE */
  +    uint8_t * ui8p;		/*!< RPM_UINT8_TYPE | RPM_CHAR_TYPE */
  +    uint16_t * ui16p;		/*!< RPM_UINT16_TYPE */
  +    uint32_t * ui32p;		/*!< RPM_UINT32_TYPE */
  +    uint64_t * ui64p;		/*!< RPM_UINT64_TYPE */
       const char * str;		/*!< RPM_STRING_TYPE */
       unsigned char * blob;	/*!< RPM_BIN_TYPE */
       const char ** argv;		/*!< RPM_STRING_ARRAY_TYPE */
  @@ -73,10 +73,6 @@
   #endif
   /*@=typeuse =fielduse@*/
   
  -/** \ingroup header
  - */
  -typedef rpmTagData *	hPTR_t;
  -
   /*@=typeuse =fielduse@*/
   /** \ingroup header
    */
  @@ -126,25 +122,6 @@
   typedef /*@abstract@*/ struct headerSprintfExtension_s * headerSprintfExtension;
   
   /**
  - * Automatically generated table of tag name/value pairs.
  - */
  -/*@-redecl@*/
  -/*@observer@*/ /*@unchecked@*/
  -extern const struct headerTagTableEntry_s * rpmTagTable;
  -/*@=redecl@*/
  -
  -/**
  - * Number of entries in rpmTagTable.
  - */
  -/*@-redecl@*/
  -/*@unchecked@*/
  -extern const int rpmTagTableSize;
  -
  -/*@unchecked@*/
  -extern headerTagIndices rpmTags;
  -/*@=redecl@*/
  -
  -/**
    * Pseudo-tags used by the rpmdb and rpmgi iterator API's.
    */
   #define	RPMDBI_PACKAGES		0	/* Installed package headers. */
  @@ -469,6 +446,25 @@
   typedef /*@abstract@*/ struct headerTagTableEntry_s * headerTagTableEntry;
   
   /**
  + * Automatically generated table of tag name/value pairs.
  + */
  +/*@-redecl@*/
  +/*@observer@*/ /*@unchecked@*/
  +extern const struct headerTagTableEntry_s * rpmTagTable;
  +/*@=redecl@*/
  +
  +/**
  + * Number of entries in rpmTagTable.
  + */
  +/*@-redecl@*/
  +/*@unchecked@*/
  +extern const int rpmTagTableSize;
  +
  +/*@unchecked@*/
  +extern headerTagIndices rpmTags;
  +/*@=redecl@*/
  +
  +/**
    */
   #if !defined(SWIG)
   struct headerTagIndices_s {
  @@ .