- Forward declaration of register functions.

svn path=/trunk/; revision=53873

7 files changed, 63 insertions, 42 deletions

diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index 170ce1b5bf..9ffe5e03e3 100644
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -57,6 +57,9 @@
 #define PSNAME "CDT"
 #define PFNAME "cdt"
 
+void proto_register_cdt(void);
+void proto_reg_handoff_cdt(void);
+
 static proto_tree *top_tree = NULL;
 static proto_item *cdt_item = NULL;
 
@@ -78,7 +81,7 @@ static int hf_cdt_contentType_OID = -1;           /* T_contentType_OID */
 static int hf_cdt_compressedContent = -1;         /* CompressedContent */
 
 /*--- End of included file: packet-cdt-hf.c ---*/
-#line 60 "../../asn1/cdt/packet-cdt-template.c"
+#line 63 "../../asn1/cdt/packet-cdt-template.c"
 
 static dissector_handle_t data_handle = NULL;
 
@@ -92,7 +95,7 @@ static gint ett_cdt_CompressedContentInfo = -1;
 static gint ett_cdt_T_contentType = -1;
 
 /*--- End of included file: packet-cdt-ett.c ---*/
-#line 65 "../../asn1/cdt/packet-cdt-template.c"
+#line 68 "../../asn1/cdt/packet-cdt-template.c"
 
 static expert_field ei_cdt_unable_compress_content = EI_INIT;
 static expert_field ei_cdt_unable_uncompress_content = EI_INIT;
@@ -335,7 +338,7 @@ static void dissect_CompressedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
 
 
 /*--- End of included file: packet-cdt-fn.c ---*/
-#line 70 "../../asn1/cdt/packet-cdt-template.c"
+#line 73 "../../asn1/cdt/packet-cdt-template.c"
 
 
 /*--- proto_register_cdt -------------------------------------------*/
@@ -408,7 +411,7 @@ void proto_register_cdt (void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-cdt-hfarr.c ---*/
-#line 102 "../../asn1/cdt/packet-cdt-template.c"
+#line 105 "../../asn1/cdt/packet-cdt-template.c"
   };
 
   /* List of subtrees */
@@ -422,7 +425,7 @@ void proto_register_cdt (void) {
     &ett_cdt_T_contentType,
 
 /*--- End of included file: packet-cdt-ettarr.c ---*/
-#line 107 "../../asn1/cdt/packet-cdt-template.c"
+#line 110 "../../asn1/cdt/packet-cdt-template.c"
   };
 
   static ei_register_info ei[] = {
@@ -452,7 +455,7 @@ void proto_reg_handoff_cdt (void) {
 
 
 /*--- End of included file: packet-cdt-dis-tab.c ---*/
-#line 130 "../../asn1/cdt/packet-cdt-template.c"
+#line 133 "../../asn1/cdt/packet-cdt-template.c"
 
   data_handle = find_dissector ("data");
 }
diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c
index 8f3ff3ce44..f8a7ba6429 100644
--- a/epan/dissectors/packet-charging_ase.c
+++ b/epan/dissectors/packet-charging_ase.c
@@ -44,6 +44,9 @@
 #define PSNAME "ChargingASE"
 #define PFNAME "chargingase"
 
+void proto_register_charging_ase(void);
+void proto_reg_handoff_charging_ase(void);
+
 /* Define the Charging ASE proto */
 static int proto_charging_ase = -1;
 
@@ -114,7 +117,7 @@ static int hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff = -1;
 static int hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff = -1;
 
 /*--- End of included file: packet-charging_ase-hf.c ---*/
-#line 43 "../../asn1/charging_ase/packet-charging_ase-template.c"
+#line 46 "../../asn1/charging_ase/packet-charging_ase-template.c"
 
 static int ett_charging_ase = -1;
 
@@ -152,7 +155,7 @@ static gint ett_charging_ase_T_tariffControlIndicators_01 = -1;
 static gint ett_charging_ase_ChargingReferenceIdentification = -1;
 
 /*--- End of included file: packet-charging_ase-ett.c ---*/
-#line 46 "../../asn1/charging_ase/packet-charging_ase-template.c"
+#line 49 "../../asn1/charging_ase/packet-charging_ase-template.c"
 
 static dissector_handle_t charging_ase_handle;
 
@@ -838,7 +841,7 @@ int dissect_charging_ase_ChargingMessageType_PDU(tvbuff_t *tvb _U_, packet_info
 
 
 /*--- End of included file: packet-charging_ase-fn.c ---*/
-#line 50 "../../asn1/charging_ase/packet-charging_ase-template.c"
+#line 53 "../../asn1/charging_ase/packet-charging_ase-template.c"
 
 static void
 dissect_charging_ase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -1110,7 +1113,7 @@ proto_register_charging_ase(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-charging_ase-hfarr.c ---*/
-#line 73 "../../asn1/charging_ase/packet-charging_ase-template.c"
+#line 76 "../../asn1/charging_ase/packet-charging_ase-template.c"
   };
 
   /* List of subtrees */
@@ -1151,7 +1154,7 @@ proto_register_charging_ase(void)
     &ett_charging_ase_ChargingReferenceIdentification,
 
 /*--- End of included file: packet-charging_ase-ettarr.c ---*/
-#line 79 "../../asn1/charging_ase/packet-charging_ase-template.c"
+#line 82 "../../asn1/charging_ase/packet-charging_ase-template.c"
         };
 
   proto_charging_ase = proto_register_protocol(PNAME, PSNAME, PFNAME);
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index ac33d43a51..f732262c6b 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -48,6 +48,9 @@
 #define PSNAME "CRMF"
 #define PFNAME "crmf"
 
+void proto_register_crmf(void);
+void proto_reg_handoff_crmf(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_crmf = -1;
 static int hf_crmf_type_oid = -1;
@@ -136,7 +139,7 @@ static int hf_crmf_attributes = -1;               /* Attributes */
 static int hf_crmf_Attributes_item = -1;          /* Attribute */
 
 /*--- End of included file: packet-crmf-hf.c ---*/
-#line 47 "../../asn1/crmf/packet-crmf-template.c"
+#line 50 "../../asn1/crmf/packet-crmf-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -170,7 +173,7 @@ static gint ett_crmf_PrivateKeyInfo = -1;
 static gint ett_crmf_Attributes = -1;
 
 /*--- End of included file: packet-crmf-ett.c ---*/
-#line 50 "../../asn1/crmf/packet-crmf-template.c"
+#line 53 "../../asn1/crmf/packet-crmf-template.c"
 
 /*--- Included file: packet-crmf-fn.c ---*/
 #line 1 "../../asn1/crmf/packet-crmf-fn.c"
@@ -883,7 +886,7 @@ static void dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-crmf-fn.c ---*/
-#line 51 "../../asn1/crmf/packet-crmf-template.c"
+#line 54 "../../asn1/crmf/packet-crmf-template.c"
 
 
 /*--- proto_register_crmf ----------------------------------------------*/
@@ -1220,7 +1223,7 @@ void proto_register_crmf(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-crmf-hfarr.c ---*/
-#line 63 "../../asn1/crmf/packet-crmf-template.c"
+#line 66 "../../asn1/crmf/packet-crmf-template.c"
   };
 
   /* List of subtrees */
@@ -1256,7 +1259,7 @@ void proto_register_crmf(void) {
     &ett_crmf_Attributes,
 
 /*--- End of included file: packet-crmf-ettarr.c ---*/
-#line 68 "../../asn1/crmf/packet-crmf-template.c"
+#line 71 "../../asn1/crmf/packet-crmf-template.c"
   };
 
   /* Register protocol */
@@ -1290,6 +1293,6 @@ void proto_reg_handoff_crmf(void) {
 
 
 /*--- End of included file: packet-crmf-dis-tab.c ---*/
-#line 86 "../../asn1/crmf/packet-crmf-template.c"
+#line 89 "../../asn1/crmf/packet-crmf-template.c"
 }
 
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index 5968e7b7f6..378fc29223 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -61,6 +61,9 @@
 #define PSNAME "DISP"
 #define PFNAME "disp"
 
+void proto_register_disp(void);
+void proto_reg_handoff_disp(void);
+
 static guint global_disp_tcp_port = 102;
 static dissector_handle_t tpkt_handle;
 static void prefs_register_disp(void); /* forward declaration for use in preferences registration */
@@ -181,7 +184,7 @@ static int hf_disp_signedShadowError = -1;        /* T_signedShadowError */
 static int hf_disp_shadowError = -1;              /* ShadowErrorData */
 
 /*--- End of included file: packet-disp-hf.c ---*/
-#line 65 "../../asn1/disp/packet-disp-template.c"
+#line 68 "../../asn1/disp/packet-disp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_disp = -1;
@@ -244,7 +247,7 @@ static gint ett_disp_ShadowError = -1;
 static gint ett_disp_T_signedShadowError = -1;
 
 /*--- End of included file: packet-disp-ett.c ---*/
-#line 69 "../../asn1/disp/packet-disp-template.c"
+#line 72 "../../asn1/disp/packet-disp-template.c"
 
 
 /*--- Included file: packet-disp-fn.c ---*/
@@ -1494,7 +1497,7 @@ static void dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb _U_, packet_info *p
 
 
 /*--- End of included file: packet-disp-fn.c ---*/
-#line 71 "../../asn1/disp/packet-disp-template.c"
+#line 74 "../../asn1/disp/packet-disp-template.c"
 
 /*
 * Dissect DISP PDUs inside a ROS PDUs
@@ -2058,7 +2061,7 @@ void proto_register_disp(void) {
         "ShadowErrorData", HFILL }},
 
 /*--- End of included file: packet-disp-hfarr.c ---*/
-#line 202 "../../asn1/disp/packet-disp-template.c"
+#line 205 "../../asn1/disp/packet-disp-template.c"
   };
 
   /* List of subtrees */
@@ -2123,7 +2126,7 @@ void proto_register_disp(void) {
     &ett_disp_T_signedShadowError,
 
 /*--- End of included file: packet-disp-ettarr.c ---*/
-#line 208 "../../asn1/disp/packet-disp-template.c"
+#line 211 "../../asn1/disp/packet-disp-template.c"
   };
   module_t *disp_module;
 
@@ -2162,7 +2165,7 @@ void proto_reg_handoff_disp(void) {
 
 
 /*--- End of included file: packet-disp-dis-tab.c ---*/
-#line 236 "../../asn1/disp/packet-disp-template.c"
+#line 239 "../../asn1/disp/packet-disp-template.c"
 
   /* APPLICATION CONTEXT */
 
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index c6306bc27f..ee56b73368 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -59,6 +59,9 @@
 #define PSNAME "DOP"
 #define PFNAME "dop"
 
+void proto_register_dop(void);
+void proto_reg_handoff_dop(void);
+
 static guint global_dop_tcp_port = 102;
 static dissector_handle_t tpkt_handle;
 static void prefs_register_dop(void); /* forward declaration for use in preferences registration */
@@ -266,7 +269,7 @@ static int hf_dop_GrantsAndDenials_grantInvoke = -1;
 static int hf_dop_GrantsAndDenials_denyInvoke = -1;
 
 /*--- End of included file: packet-dop-hf.c ---*/
-#line 66 "../../asn1/dop/packet-dop-template.c"
+#line 69 "../../asn1/dop/packet-dop-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_dop = -1;
@@ -343,7 +346,7 @@ static gint ett_dop_T_basicLevels = -1;
 static gint ett_dop_GrantsAndDenials = -1;
 
 /*--- End of included file: packet-dop-ett.c ---*/
-#line 71 "../../asn1/dop/packet-dop-template.c"
+#line 74 "../../asn1/dop/packet-dop-template.c"
 
 static expert_field ei_dop_unknown_binding_parameter = EI_INIT;
 
@@ -2044,7 +2047,7 @@ static void dissect_ACIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-dop-fn.c ---*/
-#line 86 "../../asn1/dop/packet-dop-template.c"
+#line 89 "../../asn1/dop/packet-dop-template.c"
 
 static int
 call_dop_oid_callback(const char *base_string, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, const char *col_info, void* data)
@@ -2968,7 +2971,7 @@ void proto_register_dop(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-dop-hfarr.c ---*/
-#line 245 "../../asn1/dop/packet-dop-template.c"
+#line 248 "../../asn1/dop/packet-dop-template.c"
   };
 
   /* List of subtrees */
@@ -3047,7 +3050,7 @@ void proto_register_dop(void) {
     &ett_dop_GrantsAndDenials,
 
 /*--- End of included file: packet-dop-ettarr.c ---*/
-#line 252 "../../asn1/dop/packet-dop-template.c"
+#line 255 "../../asn1/dop/packet-dop-template.c"
   };
 
   static ei_register_info ei[] = {
@@ -3110,7 +3113,7 @@ void proto_reg_handoff_dop(void) {
 
 
 /*--- End of included file: packet-dop-dis-tab.c ---*/
-#line 292 "../../asn1/dop/packet-dop-template.c"
+#line 295 "../../asn1/dop/packet-dop-template.c"
   /* APPLICATION CONTEXT */
 
   oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3");
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 6f80571473..6a6cd16996 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -55,6 +55,9 @@
 #define PSNAME "DSP"
 #define PFNAME "dsp"
 
+void proto_register_dsp(void);
+void proto_reg_handoff_dsp(void);
+
 static guint global_dsp_tcp_port = 102;
 static dissector_handle_t tpkt_handle;
 static void prefs_register_dsp(void); /* forward declaration for use in preferences registration */
@@ -205,7 +208,7 @@ static int hf_dsp_signed = -1;                    /* BOOLEAN */
 static int hf_dsp_other = -1;                     /* EXTERNAL */
 
 /*--- End of included file: packet-dsp-hf.c ---*/
-#line 59 "../../asn1/dsp/packet-dsp-template.c"
+#line 62 "../../asn1/dsp/packet-dsp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_dsp = -1;
@@ -285,7 +288,7 @@ static gint ett_dsp_AuthenticationLevel = -1;
 static gint ett_dsp_T_basicLevels = -1;
 
 /*--- End of included file: packet-dsp-ett.c ---*/
-#line 63 "../../asn1/dsp/packet-dsp-template.c"
+#line 66 "../../asn1/dsp/packet-dsp-template.c"
 
 
 /*--- Included file: packet-dsp-fn.c ---*/
@@ -1783,7 +1786,7 @@ static void dissect_DitBridgeKnowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 /*--- End of included file: packet-dsp-fn.c ---*/
-#line 65 "../../asn1/dsp/packet-dsp-template.c"
+#line 68 "../../asn1/dsp/packet-dsp-template.c"
 
 /*
 * Dissect X518 PDUs inside a ROS PDUs
@@ -2545,7 +2548,7 @@ void proto_register_dsp(void) {
         "EXTERNAL", HFILL }},
 
 /*--- End of included file: packet-dsp-hfarr.c ---*/
-#line 274 "../../asn1/dsp/packet-dsp-template.c"
+#line 277 "../../asn1/dsp/packet-dsp-template.c"
   };
 
   /* List of subtrees */
@@ -2627,7 +2630,7 @@ void proto_register_dsp(void) {
     &ett_dsp_T_basicLevels,
 
 /*--- End of included file: packet-dsp-ettarr.c ---*/
-#line 280 "../../asn1/dsp/packet-dsp-template.c"
+#line 283 "../../asn1/dsp/packet-dsp-template.c"
   };
   module_t *dsp_module;
 
@@ -2668,7 +2671,7 @@ void proto_reg_handoff_dsp(void) {
 
 
 /*--- End of included file: packet-dsp-dis-tab.c ---*/
-#line 310 "../../asn1/dsp/packet-dsp-template.c"
+#line 313 "../../asn1/dsp/packet-dsp-template.c"
 
   /* APPLICATION CONTEXT */
 
diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 877db6a8d5..8a89070f36 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -52,6 +52,9 @@
 #define PSNAME "ESS"
 #define PFNAME "ess"
 
+void proto_register_ess(void);
+void proto_reg_handoff_ess(void);
+
 typedef struct _ess_category_attributes_t {
    char *oid;
    guint lacv;
@@ -143,7 +146,7 @@ static int hf_ess_issuer = -1;                    /* GeneralNames */
 static int hf_ess_serialNumber = -1;              /* CertificateSerialNumber */
 
 /*--- End of included file: packet-ess-hf.c ---*/
-#line 64 "../../asn1/ess/packet-ess-template.c"
+#line 67 "../../asn1/ess/packet-ess-template.c"
 
 
 /*--- Included file: packet-ess-val.h ---*/
@@ -167,7 +170,7 @@ static int hf_ess_serialNumber = -1;              /* CertificateSerialNumber */
 #define id_sha256                      "2.16.840.1.101.3.4.2.1"
 
 /*--- End of included file: packet-ess-val.h ---*/
-#line 66 "../../asn1/ess/packet-ess-template.c"
+#line 69 "../../asn1/ess/packet-ess-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -206,7 +209,7 @@ static gint ett_ess_ESSCertID = -1;
 static gint ett_ess_IssuerSerial = -1;
 
 /*--- End of included file: packet-ess-ett.c ---*/
-#line 69 "../../asn1/ess/packet-ess-template.c"
+#line 72 "../../asn1/ess/packet-ess-template.c"
 
 static const char *object_identifier_id;
 
@@ -1124,7 +1127,7 @@ static void dissect_SigningCertificateV2_PDU(tvbuff_t *tvb _U_, packet_info *pin
 
 
 /*--- End of included file: packet-ess-fn.c ---*/
-#line 140 "../../asn1/ess/packet-ess-template.c"
+#line 143 "../../asn1/ess/packet-ess-template.c"
 
 /*--- proto_register_ess ----------------------------------------------*/
 void proto_register_ess(void) {
@@ -1422,7 +1425,7 @@ void proto_register_ess(void) {
         "CertificateSerialNumber", HFILL }},
 
 /*--- End of included file: packet-ess-hfarr.c ---*/
-#line 153 "../../asn1/ess/packet-ess-template.c"
+#line 156 "../../asn1/ess/packet-ess-template.c"
   };
 
   /* List of subtrees */
@@ -1464,7 +1467,7 @@ void proto_register_ess(void) {
     &ett_ess_IssuerSerial,
 
 /*--- End of included file: packet-ess-ettarr.c ---*/
-#line 159 "../../asn1/ess/packet-ess-template.c"
+#line 162 "../../asn1/ess/packet-ess-template.c"
   };
 
   static uat_field_t attributes_flds[] = {
@@ -1531,6 +1534,6 @@ void proto_reg_handoff_ess(void) {
 
 
 /*--- End of included file: packet-ess-dis-tab.c ---*/
-#line 204 "../../asn1/ess/packet-ess-template.c"
+#line 207 "../../asn1/ess/packet-ess-template.c"
 }