Remove redundant forward declarations in ASN1

diff --git a/src/asn1/asn1c/ASIdentifierChoice.h b/src/asn1/asn1c/ASIdentifierChoice.h
index 1c66f74bb6d81a0efd202bb80ae1b2ebcb3ea249..ede383be7ac65437a8a0dd3beed617cbedf82633 100644 (file)
--- a/src/asn1/asn1c/ASIdentifierChoice.h
+++ b/src/asn1/asn1c/ASIdentifierChoice.h
@@ -22,9 +22,6 @@ typedef enum ASIdentifierChoice_PR {
        ASIdentifierChoice_PR_asIdsOrRanges
 } ASIdentifierChoice_PR;
 
-/* Forward declarations */
-struct ASIdOrRange;
-
 /* ASIdentifierChoice */
 typedef struct ASIdentifierChoice {
        ASIdentifierChoice_PR present;

diff --git a/src/asn1/asn1c/ASIdentifiers.h b/src/asn1/asn1c/ASIdentifiers.h
index 5c17193de5e38748923edaa761bae8d03ccfe2d6..6f63d002431e5d86f41ad6e1082469e7b0a82385 100644 (file)
--- a/src/asn1/asn1c/ASIdentifiers.h
+++ b/src/asn1/asn1c/ASIdentifiers.h
@@ -12,9 +12,6 @@
 #include "asn1/asn1c/constr_SEQUENCE.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct ASIdentifierChoice;
-
 /* ASIdentifiers */
 typedef struct ASIdentifiers {
        struct ASIdentifierChoice       *asnum  /* OPTIONAL */;

diff --git a/src/asn1/asn1c/Extensions.h b/src/asn1/asn1c/Extensions.h
index 81badbc31c89c25ca700638a9c335fe4586b36ef..8f8799949ed651b837413ea366415dd543444a2c 100644 (file)
--- a/src/asn1/asn1c/Extensions.h
+++ b/src/asn1/asn1c/Extensions.h
@@ -13,9 +13,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct Extension;
-
 /* Extensions */
 typedef struct Extensions {
        A_SEQUENCE_OF(struct Extension) list;

diff --git a/src/asn1/asn1c/IPAddrBlocks.h b/src/asn1/asn1c/IPAddrBlocks.h
index a41fd0afd10ab91cbdfa0aee631a26bbbaf5db12..c5e1e887b33b6342dcb8822e0b7f206906f8f02f 100644 (file)
--- a/src/asn1/asn1c/IPAddrBlocks.h
+++ b/src/asn1/asn1c/IPAddrBlocks.h
@@ -13,9 +13,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct IPAddressFamily;
-
 /* IPAddrBlocks */
 typedef struct IPAddrBlocks {
        A_SEQUENCE_OF(struct IPAddressFamily) list;

diff --git a/src/asn1/asn1c/IPAddressChoice.h b/src/asn1/asn1c/IPAddressChoice.h
index 54ee62ef5f76d92428abf51a699face2a7e904f0..62cbdffdb2cdb2882b5ab0251a2d0db3f3a0f388 100644 (file)
--- a/src/asn1/asn1c/IPAddressChoice.h
+++ b/src/asn1/asn1c/IPAddressChoice.h
@@ -22,9 +22,6 @@ typedef enum IPAddressChoice_PR {
        IPAddressChoice_PR_addressesOrRanges
 } IPAddressChoice_PR;
 
-/* Forward declarations */
-struct IPAddressOrRange;
-
 /* IPAddressChoice */
 typedef struct IPAddressChoice {
        IPAddressChoice_PR present;

diff --git a/src/asn1/asn1c/Manifest.h b/src/asn1/asn1c/Manifest.h
index c066cf94b1acd640449d8d898d68412a5c124954..c865229f2e0c22ceca26820c3985d066613cc09f 100644 (file)
--- a/src/asn1/asn1c/Manifest.h
+++ b/src/asn1/asn1c/Manifest.h
@@ -17,9 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct FileAndHash;
-
 /* Manifest */
 typedef struct Manifest {
        INTEGER_t       *version        /* DEFAULT 0 */;

diff --git a/src/asn1/asn1c/RDNSequence.h b/src/asn1/asn1c/RDNSequence.h
index 60fb1fa3184181f76ca4172ac75a29d463c99fd4..dcf9829552807efbb3d5ed3f7bca08b039f3d61c 100644 (file)
--- a/src/asn1/asn1c/RDNSequence.h
+++ b/src/asn1/asn1c/RDNSequence.h
@@ -13,9 +13,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct RelativeDistinguishedName;
-
 /* RDNSequence */
 typedef struct RDNSequence {
        A_SEQUENCE_OF(struct RelativeDistinguishedName) list;

diff --git a/src/asn1/asn1c/ROAIPAddressFamily.h b/src/asn1/asn1c/ROAIPAddressFamily.h
index 302b457d77414bf78d45d4292fe7577783f0667a..d676528c9cf02ed54550f29e799e87089313988c 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddressFamily.h
+++ b/src/asn1/asn1c/ROAIPAddressFamily.h
@@ -15,9 +15,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct ROAIPAddress;
-
 /* ROAIPAddressFamily */
 typedef struct ROAIPAddressFamily {
        OCTET_STRING_t   addressFamily;

diff --git a/src/asn1/asn1c/RelativeDistinguishedName.h b/src/asn1/asn1c/RelativeDistinguishedName.h
index d41f2d9220221182c36dd8e8dd9dfbf3a291aeb8..89365e99f40219a2d75f3a9bb84a2c8e42ee707e 100644 (file)
--- a/src/asn1/asn1c/RelativeDistinguishedName.h
+++ b/src/asn1/asn1c/RelativeDistinguishedName.h
@@ -13,9 +13,6 @@
 #include "asn1/asn1c/constr_SET_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct AttributeTypeAndValue;
-
 /* RelativeDistinguishedName */
 typedef struct RelativeDistinguishedName {
        A_SET_OF(struct AttributeTypeAndValue) list;

diff --git a/src/asn1/asn1c/RevocationInfoChoices.h b/src/asn1/asn1c/RevocationInfoChoices.h
index a37537d425e0c22cfb7e6e10b09c35c9e82e37a3..707aa3191cd6fbde1e2e38b6ea5a97fc716e6270 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoices.h
+++ b/src/asn1/asn1c/RevocationInfoChoices.h
@@ -13,9 +13,6 @@
 #include "asn1/asn1c/constr_SET_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct RevocationInfoChoice;
-
 /* RevocationInfoChoices */
 typedef struct RevocationInfoChoices {
        A_SET_OF(struct RevocationInfoChoice) list;

diff --git a/src/asn1/asn1c/RouteOriginAttestation.h b/src/asn1/asn1c/RouteOriginAttestation.h
index 1320aa778b9e94652f5b50f4fe204c3012592a74..5a7e2b10956d9fd9aeceacd49109b6138774a5ee 100644 (file)
--- a/src/asn1/asn1c/RouteOriginAttestation.h
+++ b/src/asn1/asn1c/RouteOriginAttestation.h
@@ -16,9 +16,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct ROAIPAddressFamily;
-
 /* RouteOriginAttestation */
 typedef struct RouteOriginAttestation {
        INTEGER_t       *version        /* DEFAULT 0 */;

diff --git a/src/asn1/asn1c/SignedAttributes.h b/src/asn1/asn1c/SignedAttributes.h
index 0f6900e402dfdf037159e22bc3927cb4e3ddec47..e54fc9ebe5a67dd09d9fd7687f3f40756a407715 100644 (file)
--- a/src/asn1/asn1c/SignedAttributes.h
+++ b/src/asn1/asn1c/SignedAttributes.h
@@ -13,9 +13,6 @@
 #include "asn1/asn1c/constr_SET_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct CMSAttribute;
-
 /* SignedAttributes */
 typedef struct SignedAttributes {
        A_SET_OF(struct CMSAttribute) list;

diff --git a/src/asn1/asn1c/SignedData.h b/src/asn1/asn1c/SignedData.h
index 36270934ad1cc49fffb6911a584a41781bc5aee8..1d3a2d18fd0d9d6290314a323ae6080b00d34c72 100644 (file)
--- a/src/asn1/asn1c/SignedData.h
+++ b/src/asn1/asn1c/SignedData.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct CertificateSet;
-struct RevocationInfoChoices;
-
 /* SignedData */
 typedef struct SignedData {
        CMSVersion_t     version;

diff --git a/src/asn1/asn1c/SignedDataPKCS7.h b/src/asn1/asn1c/SignedDataPKCS7.h
index c019472af0fc525056aee11b68d1b15b38d1ec2c..af3484ef1999fdc816bdef40c20d9719d811c548 100644 (file)
--- a/src/asn1/asn1c/SignedDataPKCS7.h
+++ b/src/asn1/asn1c/SignedDataPKCS7.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct CertificateSet;
-struct RevocationInfoChoices;
-
 /* SignedDataPKCS7 */
 typedef struct SignedDataPKCS7 {
        CMSVersion_t     version;

diff --git a/src/asn1/asn1c/SignerInfo.h b/src/asn1/asn1c/SignerInfo.h
index b68ef3895bc762e2ae0f09ee08d94e7f34395d2f..929ac40250d6d2244b660d2b5bc1555ccf3f32b8 100644 (file)
--- a/src/asn1/asn1c/SignerInfo.h
+++ b/src/asn1/asn1c/SignerInfo.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/constr_SEQUENCE.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct SignedAttributes;
-struct UnsignedAttributes;
-
 /* SignerInfo */
 typedef struct SignerInfo {
        CMSVersion_t     version;

diff --git a/src/asn1/asn1c/SignerInfos.h b/src/asn1/asn1c/SignerInfos.h
index 4005a47c3e1a88f3b5b7df401a8a01ce573700ee..86430b09ebe6538e964810b975e06bf2516c25ce 100644 (file)
--- a/src/asn1/asn1c/SignerInfos.h
+++ b/src/asn1/asn1c/SignerInfos.h
@@ -13,9 +13,6 @@
 #include "asn1/asn1c/constr_SET_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct SignerInfo;
-
 /* SignerInfos */
 typedef struct SignerInfos {
        A_SET_OF(struct SignerInfo) list;

diff --git a/src/asn1/asn1c/TBSCertList.h b/src/asn1/asn1c/TBSCertList.h
index bfbbbfd7bedbddd3da46420fe481db665cf297db..8f083b5cf26e14db08a56247077413b02e75aeac 100644 (file)
--- a/src/asn1/asn1c/TBSCertList.h
+++ b/src/asn1/asn1c/TBSCertList.h
@@ -19,10 +19,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct Time;
-struct Extensions;
-
 /* Forward definitions */
 typedef struct TBSCertList__revokedCertificates__Member {
        CertificateSerialNumber_t        userCertificate;

diff --git a/src/asn1/asn1c/UnsignedAttributes.h b/src/asn1/asn1c/UnsignedAttributes.h
index 9079b59a327bd1e131775f79c40549e49ca4017a..a19a0c65c0816649fd81d009409a769e0285e4d8 100644 (file)
--- a/src/asn1/asn1c/UnsignedAttributes.h
+++ b/src/asn1/asn1c/UnsignedAttributes.h
@@ -13,9 +13,6 @@
 #include "asn1/asn1c/constr_SET_OF.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-/* Forward declarations */
-struct CMSAttribute;
-
 /* UnsignedAttributes */
 typedef struct UnsignedAttributes {
        A_SET_OF(struct CMSAttribute) list;

diff --git a/src/asn1/asn1c/asn_ioc.h b/src/asn1/asn1c/asn_ioc.h
index 90026908a259d2cba280b8cb3cf2f5784b60f199..0db8154c18b3b5a53feb04e0bf2e7364d97336d6 100644 (file)
--- a/src/asn1/asn1c/asn_ioc.h
+++ b/src/asn1/asn1c/asn_ioc.h
@@ -7,8 +7,8 @@
 #define        ASN_IOC_H
 
 #include "asn1/asn1c/asn_system.h"
+#include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;
 struct asn_ioc_cell_s;
 
 /*

diff --git a/src/asn1/asn1c/ber_decoder.h b/src/asn1/asn1c/ber_decoder.h
index 6178c3ac521b614eb5f9094b4205c965d5c12d39..756bd5779344ff6fe12128a81213034d9dd18096 100644 (file)
--- a/src/asn1/asn1c/ber_decoder.h
+++ b/src/asn1/asn1c/ber_decoder.h
@@ -7,9 +7,6 @@
 
 #include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
-struct asn_codec_ctx_s;                /* Forward declaration */
-
 /*
  * The BER decoder of any type.
  * This function may be invoked directly from the application.

diff --git a/src/asn1/asn1c/constr_TYPE.h b/src/asn1/asn1c/constr_TYPE.h
index 065830e6719307acef3f0f11341cf4bcc72f2b7e..18c97d33b71fd2920dfaa3349e8f966738b11ce0 100644 (file)
--- a/src/asn1/asn1c/constr_TYPE.h
+++ b/src/asn1/asn1c/constr_TYPE.h
@@ -17,7 +17,6 @@
 #include "asn1/asn1c/ber_tlv_length.h"
 #include "asn1/asn1c/ber_tlv_tag.h"
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
 struct asn_TYPE_member_s;      /* Forward declaration */
 
 /*

diff --git a/src/asn1/asn1c/constraints.h b/src/asn1/asn1c/constraints.h
index 18d97863490aad848267014aafde860199e6660a..230bc2329e1659d46cf4841d72419ae78f03b05a 100644 (file)
--- a/src/asn1/asn1c/constraints.h
+++ b/src/asn1/asn1c/constraints.h
@@ -8,8 +8,6 @@
 #include "asn1/asn1c/asn_system.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;          /* Forward declaration */
-
 /*
  * Validate the structure according to the ASN.1 constraints.
  * If errbuf and errlen are given, they shall be pointing to the appropriate

diff --git a/src/asn1/asn1c/der_encoder.h b/src/asn1/asn1c/der_encoder.h
index c6420b938d4650cf540386d63569298807b7b22a..ae5581d773fe1ab4aed6b23d53aba234456430e9 100644 (file)
--- a/src/asn1/asn1c/der_encoder.h
+++ b/src/asn1/asn1c/der_encoder.h
@@ -7,8 +7,6 @@
 
 #include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
-
 /*
  * The DER encoder of any type. May be invoked by the application.
  * Produces DER- and BER-compliant encoding. (DER is a subset of BER).

diff --git a/src/asn1/asn1c/json_encoder.h b/src/asn1/asn1c/json_encoder.h
index f1cc4ec5fac0e4f95466643f34b36774b2f2ef3a..9acdc8eda6df969fb2ea06edf7f9624c66b3a5b1 100644 (file)
--- a/src/asn1/asn1c/json_encoder.h
+++ b/src/asn1/asn1c/json_encoder.h
@@ -12,7 +12,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
+#include "asn1/asn1c/constr_TYPE.h"
 
 json_t *json_encode(
     const struct asn_TYPE_descriptor_s *type_descriptor,

diff --git a/src/asn1/asn1c/xer_encoder.h b/src/asn1/asn1c/xer_encoder.h
index 0d9a4a02526e3c1f83117251fd88a4293785d883..6ac103bc0c8c08ee916af8f535e90789846d6e88 100644 (file)
--- a/src/asn1/asn1c/xer_encoder.h
+++ b/src/asn1/asn1c/xer_encoder.h
@@ -7,8 +7,6 @@
 
 #include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
-
 /* Flags used by the xer_encode() and (*xer_type_encoder_f), defined below */
 enum xer_encoder_flags_e {
        /* Mode of encoding */