relocated hdrinline.h and header.c from lib to rpmdb

lib/Makefile.am

@@ -12,8 +12,7 @@ EXTRA_DIST = getdate.y
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \
-	header.h hdrinline.h \
-	misc.h rpmcli.h rpmlib.h stringbuf.h
+	header.h misc.h rpmcli.h rpmlib.h stringbuf.h
 noinst_HEADERS = \
 	cpio.h depends.h fsm.h header_internal.h \
 	manifest.h psm.h \
@@ -30,8 +29,7 @@ LIBS =
 lib_LTLIBRARIES = librpm.la
 librpm_la_SOURCES = \
 	closeall.c cpio.c depends.c formats.c fs.c fsm.c getdate.c \
-	header.c header_internal.c \
-	manifest.c misc.c package.c \
+	header_internal.c manifest.c misc.c package.c \
 	problems.c poptI.c poptK.c poptQV.c psm.c query.c \
 	rpmchecksig.c rpminstall.c rpmlead.c rpmlibprov.c rpmrc.c rpmvercmp.c \
 	signature.c stringbuf.c tagName.c tagtable.c transaction.c \

rpmdb/Makefile.am

@@ -13,7 +13,7 @@ DBLIBSRCS = db3.c db1.c falloc.c
 LIBDB = @libdb3@
 
 pkgincdir = $(pkgincludedir)
-pkginc_HEADERS = rpmdb.h
+pkginc_HEADERS = hdrinline.h rpmdb.h
 noinst_HEADERS = falloc.h fprint.h rpmhash.h
 
 mylibpaths = -L$(top_builddir)/lib/.libs
@@ -23,7 +23,7 @@ LIBS =
 
 lib_LTLIBRARIES = librpmdb.la
 librpmdb_la_SOURCES = $(DBLIBSRCS) \
-	dbconfig.c fprint.c merge.c poptDB.c rpmhash.c rpmdb.c
+	dbconfig.c header.c fprint.c merge.c poptDB.c rpmhash.c rpmdb.c
 librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
 librpmdb_la_LIBADD = $(LIBDB) $(top_builddir)/rpmio/librpmio.la
 librpmdb_la_DEPENDENCIES = $(top_builddir)/rpmio/librpmio.la

rpmdb/hdrinline.h

@@ -3,7 +3,7 @@
 #define H_HDRINLINE
 
 /** \ingroup header
- * \file lib/hdrinline.h
+ * \file rpmdb/hdrinline.h
  */
 
 #ifdef __cplusplus
@@ -44,7 +44,7 @@ Header headerNew(void)
  * @return		NULL always
  */
 /*@unused@*/ static inline
-/*@null@*/ Header headerFree( /*@null@*/ /*@killref@*/ Header h)
+/*@null@*/ Header headerFree( /*@killref@*/ /*@null@*/ Header h)
 	/*@modifies h @*/
 {
     /*@-abstract@*/
@@ -239,7 +239,7 @@ int headerIsEntry(/*@null@*/ Header h, int_32 tag)
 /** \ingroup header
  * Free data allocated when retrieved from header.
  * @param h		header
- * @param data		address of data (or NULL)
+ * @param data		pointer to tag value(s)
  * @param type		type of data (or -1 to force free)
  * @return		NULL always
  */
@@ -259,9 +259,9 @@ int headerIsEntry(/*@null@*/ Header h, int_32 tag)
  *
  * @param h		header
  * @param tag		tag
- * @retval type		address of tag value data type (or NULL)
- * @retval p		address of pointer to tag value(s) (or NULL)
- * @retval c		address of number of values (or NULL)
+ * @retval *type	tag value data type (or NULL)
+ * @retval *p		pointer to tag value(s) (or NULL)
+ * @retval *c		number of values (or NULL)
  * @return		1 on success, 0 on failure
  */
 /*@unused@*/ static inline
@@ -281,9 +281,9 @@ int headerGetEntry(Header h, int_32 tag,
  *
  * @param h		header
  * @param tag		tag
- * @retval type		address of tag value data type (or NULL)
- * @retval p		address of pointer to tag value(s) (or NULL)
- * @retval c		address of number of values (or NULL)
+ * @retval *type	tag value data type (or NULL)
+ * @retval *p		pointer to tag value(s) (or NULL)
+ * @retval *c		number of values (or NULL)
  * @return		1 on success, 0 on failure
  */
 /*@unused@*/ static inline
@@ -484,10 +484,10 @@ HeaderIterator headerInitIterator(Header h)
 /** \ingroup header
  * Return next tag from header.
  * @param hi		header tag iterator
- * @retval tag		address of tag
- * @retval type		address of tag value data type
- * @retval p		address of pointer to tag value(s)
- * @retval c		address of number of values
+ * @retval *tag		tag
+ * @retval *type	tag value data type
+ * @retval *p		pointer to tag value(s)
+ * @retval *c		number of values
  * @return		1 on success, 0 on failure
  */
 /*@unused@*/ static inline

rpmdb/header.c

@@ -1,5 +1,5 @@
 /** \ingroup header
- * \file lib/header.c
+ * \file rpmdb/header.c
  */
 
 /* RPM - Copyright (C) 1995-2000 Red Hat Software */