Unexport all the umphteen pgp related tables

- nothing outside rpmpgp.c needs

diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 50cc5c1..39e6df3 100644 (file)
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -23,7 +23,7 @@ static pgpDig _dig = NULL;
 
 static pgpDigParams _digp = NULL;
 
-struct pgpValTbl_s const pgpSigTypeTbl[] = {
+static struct pgpValTbl_s const pgpSigTypeTbl[] = {
     { PGPSIGTYPE_BINARY,       "Binary document signature" },
     { PGPSIGTYPE_TEXT,         "Text document signature" },
     { PGPSIGTYPE_STANDALONE,   "Standalone signature" },
@@ -40,7 +40,7 @@ struct pgpValTbl_s const pgpSigTypeTbl[] = {
     { -1,                      "Unknown signature type" },
 };
 
-struct pgpValTbl_s const pgpPubkeyTbl[] = {
+static struct pgpValTbl_s const pgpPubkeyTbl[] = {
     { PGPPUBKEYALGO_RSA,       "RSA" },
     { PGPPUBKEYALGO_RSA_ENCRYPT,"RSA(Encrypt-Only)" },
     { PGPPUBKEYALGO_RSA_SIGN,  "RSA(Sign-Only)" },
@@ -53,7 +53,7 @@ struct pgpValTbl_s const pgpPubkeyTbl[] = {
     { -1,                      "Unknown public key algorithm" },
 };
 
-struct pgpValTbl_s const pgpSymkeyTbl[] = {
+static struct pgpValTbl_s const pgpSymkeyTbl[] = {
     { PGPSYMKEYALGO_PLAINTEXT, "Plaintext" },
     { PGPSYMKEYALGO_IDEA,      "IDEA" },
     { PGPSYMKEYALGO_TRIPLE_DES,        "3DES" },
@@ -69,7 +69,7 @@ struct pgpValTbl_s const pgpSymkeyTbl[] = {
     { -1,                      "Unknown symmetric key algorithm" },
 };
 
-struct pgpValTbl_s const pgpCompressionTbl[] = {
+static struct pgpValTbl_s const pgpCompressionTbl[] = {
     { PGPCOMPRESSALGO_NONE,    "Uncompressed" },
     { PGPCOMPRESSALGO_ZIP,     "ZIP" },
     { PGPCOMPRESSALGO_ZLIB,    "ZLIB" },
@@ -77,7 +77,7 @@ struct pgpValTbl_s const pgpCompressionTbl[] = {
     { -1,                      "Unknown compression algorithm" },
 };
 
-struct pgpValTbl_s const pgpHashTbl[] = {
+static struct pgpValTbl_s const pgpHashTbl[] = {
     { PGPHASHALGO_MD5,         "MD5" },
     { PGPHASHALGO_SHA1,                "SHA1" },
     { PGPHASHALGO_RIPEMD160,   "RIPEMD160" },
@@ -90,12 +90,12 @@ struct pgpValTbl_s const pgpHashTbl[] = {
     { -1,                      "Unknown hash algorithm" },
 };
 
-struct pgpValTbl_s const pgpKeyServerPrefsTbl[] = {
+static struct pgpValTbl_s const pgpKeyServerPrefsTbl[] = {
     { 0x80,                    "No-modify" },
     { -1,                      "Unknown key server preference" },
 };
 
-struct pgpValTbl_s const pgpSubTypeTbl[] = {
+static struct pgpValTbl_s const pgpSubTypeTbl[] = {
     { PGPSUBTYPE_SIG_CREATE_TIME,"signature creation time" },
     { PGPSUBTYPE_SIG_EXPIRE_TIME,"signature expiration time" },
     { PGPSUBTYPE_EXPORTABLE_CERT,"exportable certification" },
@@ -134,7 +134,7 @@ struct pgpValTbl_s const pgpSubTypeTbl[] = {
     { -1,                      "Unknown signature subkey type" },
 };
 
-struct pgpValTbl_s const pgpTagTbl[] = {
+static struct pgpValTbl_s const pgpTagTbl[] = {
     { PGPTAG_PUBLIC_SESSION_KEY,"Public-Key Encrypted Session Key" },
     { PGPTAG_SIGNATURE,                "Signature" },
     { PGPTAG_SYMMETRIC_SESSION_KEY,"Symmetric-Key Encrypted Session Key" },
@@ -160,7 +160,7 @@ struct pgpValTbl_s const pgpTagTbl[] = {
     { -1,                      "Unknown packet tag" },
 };
 
-struct pgpValTbl_s const pgpArmorTbl[] = {
+static struct pgpValTbl_s const pgpArmorTbl[] = {
     { PGPARMOR_MESSAGE,                "MESSAGE" },
     { PGPARMOR_PUBKEY,         "PUBLIC KEY BLOCK" },
     { PGPARMOR_SIGNATURE,      "SIGNATURE" },
@@ -171,7 +171,7 @@ struct pgpValTbl_s const pgpArmorTbl[] = {
     { -1,                      "Unknown armor block" }
 };
 
-struct pgpValTbl_s const pgpArmorKeyTbl[] = {
+static struct pgpValTbl_s const pgpArmorKeyTbl[] = {
     { PGPARMORKEY_VERSION,     "Version: " },
     { PGPARMORKEY_COMMENT,     "Comment: " },
     { PGPARMORKEY_MESSAGEID,   "MessageID: " },

diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index e3f4e93..bbb23e4 100644 (file)
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -76,10 +76,6 @@ typedef enum pgpTag_e {
 } pgpTag;
 
 /** \ingroup rpmpgp
- */
-extern struct pgpValTbl_s const pgpTagTbl[];
-
-/** \ingroup rpmpgp
  * 5.1. Public-Key Encrypted Session Key Packets (Tag 1)
  *
  * A Public-Key Encrypted Session Key packet holds the session key used
@@ -147,10 +143,6 @@ typedef enum pgpSigType_e {
 } pgpSigType;
 
 /** \ingroup rpmpgp
- */
-extern struct pgpValTbl_s const pgpSigTypeTbl[];
-
-/** \ingroup rpmpgp
  * 9.1. Public Key Algorithms
  *
 \verbatim
@@ -186,10 +178,6 @@ typedef enum pgpPubkeyAlgo_e {
 } pgpPubkeyAlgo;
 
 /** \ingroup rpmpgp
- */
-extern struct pgpValTbl_s const pgpPubkeyTbl[];
-
-/** \ingroup rpmpgp
  * 9.2. Symmetric Key Algorithms
  *
 \verbatim
@@ -229,11 +217,6 @@ typedef enum pgpSymkeyAlgo_e {
 } pgpSymkeyAlgo;
 
 /** \ingroup rpmpgp
- * Symmetric key (string, value) pairs.
- */
-extern struct pgpValTbl_s const pgpSymkeyTbl[];
-
-/** \ingroup rpmpgp
  * 9.3. Compression Algorithms
  *
 \verbatim
@@ -256,11 +239,6 @@ typedef enum pgpCompressAlgo_e {
 } pgpCompressAlgo;
 
 /** \ingroup rpmpgp
- * Compression (string, value) pairs.
- */
-extern struct pgpValTbl_s const pgpCompressionTbl[];
-
-/** \ingroup rpmpgp
  * 9.4. Hash Algorithms
  *
 \verbatim
@@ -294,11 +272,6 @@ typedef enum pgpHashAlgo_e {
 } pgpHashAlgo;
 
 /** \ingroup rpmpgp
- * Hash (string, value) pairs.
- */
-extern struct pgpValTbl_s const pgpHashTbl[];
-
-/** \ingroup rpmpgp
  * 5.2.2. Version 3 Signature Packet Format
  * 
  * The body of a version 3 Signature Packet contains:
@@ -467,11 +440,6 @@ typedef enum pgpSubType_e {
 } pgpSubType;
 
 /** \ingroup rpmpgp
- * Subtype (string, value) pairs.
- */
-extern struct pgpValTbl_s const pgpSubTypeTbl[];
-
-/** \ingroup rpmpgp
  * 5.2. Signature Packet (Tag 2)
  *
  * A signature packet describes a binding between some public key and
@@ -942,11 +910,6 @@ typedef enum pgpArmor_e {
 } pgpArmor;
 
 /** \ingroup rpmpgp
- * Armor (string, value) pairs.
- */
-extern struct pgpValTbl_s const pgpArmorTbl[];
-
-/** \ingroup rpmpgp
  */
 typedef enum pgpArmorKey_e {
     PGPARMORKEY_VERSION                = 1, /*!< Version: */
@@ -957,11 +920,6 @@ typedef enum pgpArmorKey_e {
 } pgpArmorKey;
 
 /** \ingroup rpmpgp
- * Armor key (string, value) pairs.
- */
-extern struct pgpValTbl_s const pgpArmorKeyTbl[];
-
-/** \ingroup rpmpgp
  * Bit(s) to control digest operation.
  */
 typedef enum rpmDigestFlags_e {