Eliminate rpmTagTable internals from API/ABI completely

- everything is now accessible through other methods, no need to expose
  our internals
- tagtbl.c is now included from tagname.c instead and not separately built

diff --git a/lib/Makefile.am b/lib/Makefile.am
index aaa1376..a68146b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\""
 
 check_PROGRAMS =
 CLEANFILES =
-EXTRA_DIST = gentagtbl.sh
+EXTRA_DIST = gentagtbl.sh tagtbl.c
 EXTRA_PROGRAMS =
 
 usrlibdir = $(libdir)
@@ -24,7 +24,7 @@ librpm_la_SOURCES = \
        backend/dbconfig.c backend/db3.c \
        hdrNVR.c header.c headerfmt.c header_internal.c header_internal.h \
        poptDB.c rpmhash.c rpmhash.h rpmdb.c rpmdb_internal.h \
-       fprint.c fprint.h tagname.c tagtbl.c rpmtd.c \
+       fprint.c fprint.h tagname.c rpmtd.c \
        cpio.c cpio.h depends.c formats.c tagexts.c fs.c fsm.c fsm.h \
        manifest.c manifest.h misc.c package.c \
        poptALL.c poptI.c poptQV.c psm.c psm.h query.c \

diff --git a/lib/gentagtbl.sh b/lib/gentagtbl.sh
index 3f6f7b5..2fd3abe 100755 (executable)
--- a/lib/gentagtbl.sh
+++ b/lib/gentagtbl.sh
@@ -1,12 +1,7 @@
 #!/bin/sh
 
 cat << EOF
-#include "system.h"
-#include <rpm/header.h>
-#include <rpm/rpmtag.h>
-#include "debug.h"
-
-static const struct headerTagTableEntry_s rpmTagTbl[] = {
+static const struct headerTagTableEntry_s rpmTagTable[] = {
 EOF
 
 ${AWK} '/[\t ](RPMTAG_[A-Z0-9]*)[ \t]+([0-9]*)/ && !/internal/ {
@@ -81,8 +76,5 @@ ${AWK} '/[\t ](RPMTAG_[A-Z0-9]*)[ \t]+([0-9]*)/ && !/internal/ {
 cat << EOF
     { NULL, NULL, 0, 0, 0 }
 };
-
-const struct headerTagTableEntry_s * const rpmTagTable = rpmTagTbl;
-const int rpmTagTableSize = sizeof(rpmTagTbl) / sizeof(rpmTagTbl[0]) - 1;
 EOF
 

diff --git a/lib/header.h b/lib/header.h
index 14e0d0f..d2d56c4 100644 (file)
--- a/lib/header.h
+++ b/lib/header.h
@@ -22,36 +22,6 @@ extern "C" {
 #endif
 
 /** \ingroup header
- * Associate tag names with numeric values.
- */
-typedef const struct headerTagTableEntry_s * headerTagTableEntry;
-struct headerTagTableEntry_s {
-    const char * name;         /*!< Tag name. */
-    const char * shortname;    /*!< "Human readable" short name. */
-    rpmTag val;                        /*!< Tag numeric value. */
-    rpmTagType type;           /*!< Tag type. */
-    int extension;             /*!< Extension or "real" tag */
-};
-
-/**
- */
-typedef struct headerTagIndices_s * headerTagIndices;
-
-/** \ingroup rpmtag
- * Automatically generated table of tag name/value pairs.
- */
-extern const struct headerTagTableEntry_s * const rpmTagTable;
-
-/** \ingroup rpmtag
- * Number of entries in rpmTagTable.
- */
-extern const int rpmTagTableSize;
-
-/** \ingroup rpmtag
- */
-extern headerTagIndices const rpmTags;
-
-/** \ingroup header
  * Include calculation for 8 bytes of (magic, 0)?
  */
 enum hMagic {

diff --git a/lib/tagname.c b/lib/tagname.c
index 5e2ba5b..c8c51dc 100644 (file)
--- a/lib/tagname.c
+++ b/lib/tagname.c
@@ -8,6 +8,26 @@
 #include <rpm/rpmstring.h>
 #include "debug.h"
 
+/** \ingroup header
+ * Associate tag names with numeric values.
+ */
+typedef const struct headerTagTableEntry_s * headerTagTableEntry;
+struct headerTagTableEntry_s {
+    const char * name;         /*!< Tag name. */
+    const char * shortname;    /*!< "Human readable" short name. */
+    rpmTag val;                        /*!< Tag numeric value. */
+    rpmTagType type;           /*!< Tag type. */
+    int extension;             /*!< Extension or "real" tag */
+};
+
+#include "tagtbl.c"
+
+static const int rpmTagTableSize = sizeof(rpmTagTable) / sizeof(rpmTagTable[0]) - 1;
+
+/**
+ */
+typedef struct headerTagIndices_s * headerTagIndices;
+
 struct headerTagIndices_s {
     int (*loadIndex) (headerTagTableEntry ** ipp, int * np,
                 int (*cmp) (const void * avp, const void * bvp));
@@ -93,7 +113,7 @@ static struct headerTagIndices_s _rpmTags = {
     NULL, 0, tagCmpValue, _tagName, _tagType,
 };
 
-headerTagIndices const rpmTags = &_rpmTags;
+static headerTagIndices const rpmTags = &_rpmTags;
 
 static const char * _tagName(rpmTag tag)
 {