- Forward declaration of register functions.

svn path=/trunk/; revision=53876

7 files changed, 60 insertions, 40 deletions

diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c
index f4e4341993..f56ad3d24a 100644
--- a/epan/dissectors/packet-h282.c
+++ b/epan/dissectors/packet-h282.c
@@ -44,6 +44,9 @@
 #define PSNAME "RDC"
 #define PFNAME "rdc"
 
+void proto_register_h282(void);
+void proto_reg_handoff_h282(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_h282 = -1;
 
@@ -484,7 +487,7 @@ static int hf_h282_deviceEventNotifyIndication = -1;  /* DeviceEventNotifyIndica
 static int hf_h282_nonStandardIndication = -1;    /* NonStandardPDU */
 
 /*--- End of included file: packet-h282-hf.c ---*/
-#line 42 "../../asn1/h282/packet-h282-template.c"
+#line 45 "../../asn1/h282/packet-h282-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_h282 = -1;
@@ -636,7 +639,7 @@ static gint ett_h282_ResponsePDU = -1;
 static gint ett_h282_IndicationPDU = -1;
 
 /*--- End of included file: packet-h282-ett.c ---*/
-#line 46 "../../asn1/h282/packet-h282-template.c"
+#line 49 "../../asn1/h282/packet-h282-template.c"
 
 /* Dissectors */
 
@@ -4395,7 +4398,7 @@ static int dissect_RDCPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t
 
 
 /*--- End of included file: packet-h282-fn.c ---*/
-#line 52 "../../asn1/h282/packet-h282-template.c"
+#line 55 "../../asn1/h282/packet-h282-template.c"
 
 static int
 dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
@@ -6153,7 +6156,7 @@ void proto_register_h282(void) {
         "NonStandardPDU", HFILL }},
 
 /*--- End of included file: packet-h282-hfarr.c ---*/
-#line 73 "../../asn1/h282/packet-h282-template.c"
+#line 76 "../../asn1/h282/packet-h282-template.c"
   };
 
   /* List of subtrees */
@@ -6307,7 +6310,7 @@ void proto_register_h282(void) {
     &ett_h282_IndicationPDU,
 
 /*--- End of included file: packet-h282-ettarr.c ---*/
-#line 79 "../../asn1/h282/packet-h282-template.c"
+#line 82 "../../asn1/h282/packet-h282-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index 01cb501f50..df9fd28104 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -52,6 +52,10 @@
 #define PSNAME "H.450"
 #define PFNAME "h450"
 
+void proto_register_h450(void);
+void proto_reg_handoff_h450(void);
+
+
 /* Initialize the protocol and registered fields */
 static int proto_h450 = -1;
 static int hf_h450_operation = -1;
@@ -445,7 +449,7 @@ static int hf_h450_12_ssMWICallbackCall = -1;     /* NULL */
 static int hf_h450_12_ssCISilentMonitorPermitted = -1;  /* NULL */
 
 /*--- End of included file: packet-h450-hf.c ---*/
-#line 52 "../../asn1/h450/packet-h450-template.c"
+#line 56 "../../asn1/h450/packet-h450-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -623,7 +627,7 @@ static gint ett_h450_12_FeatureValues = -1;
 static gint ett_h450_12_FeatureControl = -1;
 
 /*--- End of included file: packet-h450-ett.c ---*/
-#line 55 "../../asn1/h450/packet-h450-template.c"
+#line 59 "../../asn1/h450/packet-h450-template.c"
 
 static const value_string h450_str_operation[] = {
 
@@ -726,7 +730,7 @@ static const value_string h450_str_operation[] = {
   {  85, "cmnInform" },
 
 /*--- End of included file: packet-h450-table10.c ---*/
-#line 58 "../../asn1/h450/packet-h450-template.c"
+#line 62 "../../asn1/h450/packet-h450-template.c"
   {   0, NULL}
 };
 
@@ -814,7 +818,7 @@ static const value_string h450_str_error[] = {
 /* Unknown or empty loop list ERROR */
 
 /*--- End of included file: packet-h450-table20.c ---*/
-#line 63 "../../asn1/h450/packet-h450-template.c"
+#line 67 "../../asn1/h450/packet-h450-template.c"
   {   0, NULL}
 };
 
@@ -4479,7 +4483,7 @@ static int dissect_h450_12_CmnArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-h450-fn.c ---*/
-#line 72 "../../asn1/h450/packet-h450-template.c"
+#line 76 "../../asn1/h450/packet-h450-template.c"
 
 typedef struct _h450_op_t {
   gint32 opcode;
@@ -4588,7 +4592,7 @@ static const h450_op_t h450_op_tab[] = {
   /* cmnInform                */ {  85, dissect_h450_12_CmnArg_PDU, NULL },
 
 /*--- End of included file: packet-h450-table11.c ---*/
-#line 81 "../../asn1/h450/packet-h450-template.c"
+#line 85 "../../asn1/h450/packet-h450-template.c"
 };
 
 typedef struct _h450_err_t {
@@ -4680,7 +4684,7 @@ static const h450_err_t h450_err_tab[] = {
 /* Unknown or empty loop list ERROR */
 
 /*--- End of included file: packet-h450-table21.c ---*/
-#line 90 "../../asn1/h450/packet-h450-template.c"
+#line 94 "../../asn1/h450/packet-h450-template.c"
 };
 
 static const h450_op_t *get_op(gint32 opcode) {
@@ -6273,7 +6277,7 @@ void proto_register_h450(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-h450-hfarr.c ---*/
-#line 250 "../../asn1/h450/packet-h450-template.c"
+#line 254 "../../asn1/h450/packet-h450-template.c"
   };
 
   /* List of subtrees */
@@ -6453,7 +6457,7 @@ void proto_register_h450(void) {
     &ett_h450_12_FeatureControl,
 
 /*--- End of included file: packet-h450-ettarr.c ---*/
-#line 255 "../../asn1/h450/packet-h450-template.c"
+#line 259 "../../asn1/h450/packet-h450-template.c"
   };
 
 
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c
index bfc95a309f..5627cdd45e 100644
--- a/epan/dissectors/packet-idmp.c
+++ b/epan/dissectors/packet-idmp.c
@@ -55,6 +55,9 @@
 #define PSNAME "IDMP"
 #define PFNAME "idmp"
 
+void proto_register_idmp(void);
+void proto_reg_handoff_idm(void);
+
 static gboolean           idmp_desegment       = TRUE;
 static guint              global_idmp_tcp_port = 1102; /* made up for now */
 static gboolean           idmp_reassemble      = TRUE;
@@ -171,7 +174,7 @@ static int hf_idmp_present = -1;                  /* INTEGER */
 static int hf_idmp_absent = -1;                   /* NULL */
 
 /*--- End of included file: packet-idmp-hf.c ---*/
-#line 130 "../../asn1/idmp/packet-idmp-template.c"
+#line 133 "../../asn1/idmp/packet-idmp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_idmp = -1;
@@ -190,7 +193,7 @@ static gint ett_idmp_Code = -1;
 static gint ett_idmp_InvokeId = -1;
 
 /*--- End of included file: packet-idmp-ett.c ---*/
-#line 134 "../../asn1/idmp/packet-idmp-template.c"
+#line 137 "../../asn1/idmp/packet-idmp-template.c"
 
 
 /*--- Included file: packet-idmp-fn.c ---*/
@@ -618,7 +621,7 @@ dissect_idmp_IDM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 
 
 /*--- End of included file: packet-idmp-fn.c ---*/
-#line 136 "../../asn1/idmp/packet-idmp-template.c"
+#line 139 "../../asn1/idmp/packet-idmp-template.c"
 
 void
 register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name)
@@ -929,7 +932,7 @@ void proto_register_idmp(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-idmp-hfarr.c ---*/
-#line 314 "../../asn1/idmp/packet-idmp-template.c"
+#line 317 "../../asn1/idmp/packet-idmp-template.c"
     };
 
     /* List of subtrees */
@@ -952,7 +955,7 @@ void proto_register_idmp(void)
     &ett_idmp_InvokeId,
 
 /*--- End of included file: packet-idmp-ettarr.c ---*/
-#line 322 "../../asn1/idmp/packet-idmp-template.c"
+#line 325 "../../asn1/idmp/packet-idmp-template.c"
     };
     module_t *idmp_module;
 
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 8b73eb0466..e6fce7ce2c 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -56,11 +56,15 @@
 #include "packet-mac-lte.h"
 #include "packet-rlc-lte.h"
 #include "packet-pdcp-lte.h"
+#include "packet-lte-rrc.h"
 
 #define PNAME  "LTE Radio Resource Control (RRC) protocol"
 #define PSNAME "LTE RRC"
 #define PFNAME "lte_rrc"
 
+void proto_register_lte_rrc(void);
+void proto_reg_handoff_lte_rrc(void);
+
 static dissector_handle_t nas_eps_handle = NULL;
 static dissector_handle_t rrc_irat_ho_to_utran_cmd_handle = NULL;
 static dissector_handle_t rrc_sys_info_cont_handle = NULL;
@@ -177,7 +181,7 @@ typedef enum _RAT_Type_enum {
 } RAT_Type_enum;
 
 /*--- End of included file: packet-lte-rrc-val.h ---*/
-#line 76 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 80 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_lte_rrc = -1;
@@ -2316,7 +2320,7 @@ static int hf_lte_rrc_CandidateCellInfoList_r10_item = -1;  /* CandidateCellInfo
 static int hf_lte_rrc_dummy_eag_field = -1; /* never registered */ 
 
 /*--- End of included file: packet-lte-rrc-hf.c ---*/
-#line 81 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 85 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static int hf_lte_rrc_eutra_cap_feat_group_ind_1 = -1;
 static int hf_lte_rrc_eutra_cap_feat_group_ind_2 = -1;
@@ -3514,7 +3518,7 @@ static gint ett_lte_rrc_CandidateCellInfoList_r10 = -1;
 static gint ett_lte_rrc_CandidateCellInfo_r10 = -1;
 
 /*--- End of included file: packet-lte-rrc-ett.c ---*/
-#line 191 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 195 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static gint ett_lte_rrc_featureGroupIndicators = -1;
 static gint ett_lte_rrc_featureGroupIndRel9Add = -1;
@@ -34752,7 +34756,7 @@ static int dissect_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_inf
 
 
 /*--- End of included file: packet-lte-rrc-fn.c ---*/
-#line 2207 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2211 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static void
 dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -43416,7 +43420,7 @@ void proto_register_lte_rrc(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-lte-rrc-hfarr.c ---*/
-#line 2354 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2358 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
     { &hf_lte_rrc_eutra_cap_feat_group_ind_1,
       { "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1",
@@ -44927,7 +44931,7 @@ void proto_register_lte_rrc(void) {
     &ett_lte_rrc_CandidateCellInfo_r10,
 
 /*--- End of included file: packet-lte-rrc-ettarr.c ---*/
-#line 2777 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2781 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
     &ett_lte_rrc_featureGroupIndicators,
     &ett_lte_rrc_featureGroupIndRel9Add,
@@ -44994,7 +44998,7 @@ void proto_register_lte_rrc(void) {
 
 
 /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
-#line 2828 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2832 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
   register_init_routine(&lte_rrc_init_protocol);
 }
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 3dd4f46737..944f80e7ff 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -81,6 +81,9 @@
 #define nbap_debug4(str,p1,p2,p3,p4)
 #endif
 
+void proto_register_nbap(void);
+void proto_reg_handoff_nbap(void);
+
 /* Global variables */
 static dissector_handle_t fp_handle;
 static guint32	transportLayerAddress_ipv4;
@@ -1546,7 +1549,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-nbap-val.h ---*/
-#line 84 "../../asn1/nbap/packet-nbap-template.c"
+#line 87 "../../asn1/nbap/packet-nbap-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_nbap = -1;
@@ -4850,7 +4853,7 @@ static int hf_nbap_RACH_SubChannelNumbers_subCh1 = -1;
 static int hf_nbap_RACH_SubChannelNumbers_subCh0 = -1;
 
 /*--- End of included file: packet-nbap-hf.c ---*/
-#line 92 "../../asn1/nbap/packet-nbap-template.c"
+#line 95 "../../asn1/nbap/packet-nbap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_nbap = -1;
@@ -6489,7 +6492,7 @@ static gint ett_nbap_UnsuccessfulOutcome = -1;
 static gint ett_nbap_Outcome = -1;
 
 /*--- End of included file: packet-nbap-ett.c ---*/
-#line 100 "../../asn1/nbap/packet-nbap-template.c"
+#line 103 "../../asn1/nbap/packet-nbap-template.c"
 
 static expert_field ei_nbap_no_find_comm_context_id = EI_INIT;
 static expert_field ei_nbap_no_find_port_info = EI_INIT;
@@ -55162,7 +55165,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
 
 
 /*--- End of included file: packet-nbap-fn.c ---*/
-#line 322 "../../asn1/nbap/packet-nbap-template.c"
+#line 325 "../../asn1/nbap/packet-nbap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -68496,7 +68499,7 @@ void proto_register_nbap(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-nbap-hfarr.c ---*/
-#line 491 "../../asn1/nbap/packet-nbap-template.c"
+#line 494 "../../asn1/nbap/packet-nbap-template.c"
 	};
 
 	/* List of subtrees */
@@ -70136,7 +70139,7 @@ void proto_register_nbap(void)
     &ett_nbap_Outcome,
 
 /*--- End of included file: packet-nbap-ettarr.c ---*/
-#line 500 "../../asn1/nbap/packet-nbap-template.c"
+#line 503 "../../asn1/nbap/packet-nbap-template.c"
 	};
 
 	static ei_register_info ei[] = {
@@ -71290,7 +71293,7 @@ proto_reg_handoff_nbap(void)
 
 
 /*--- End of included file: packet-nbap-dis-tab.c ---*/
-#line 557 "../../asn1/nbap/packet-nbap-template.c"
+#line 560 "../../asn1/nbap/packet-nbap-template.c"
 }
 
 
diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index a8d3cd54f0..aaf768f7f0 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -50,6 +50,9 @@
 #define PSNAME "PKIX1EXPLICIT"
 #define PFNAME "pkix1explicit"
 
+void proto_register_pkix1explicit(void);
+void proto_reg_handoff_pkix1explicit(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkix1explicit = -1;
 static int hf_pkix1explicit_object_identifier_id = -1;
@@ -106,7 +109,7 @@ static int hf_pkix1explicit_min_01 = -1;          /* ASId */
 static int hf_pkix1explicit_max_01 = -1;          /* ASId */
 
 /*--- End of included file: packet-pkix1explicit-hf.c ---*/
-#line 54 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
+#line 57 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -136,7 +139,7 @@ static gint ett_pkix1explicit_ASIdOrRange = -1;
 static gint ett_pkix1explicit_ASRange = -1;
 
 /*--- End of included file: packet-pkix1explicit-ett.c ---*/
-#line 57 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
+#line 60 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
 
 
 static const char *object_identifier_id;
@@ -809,7 +812,7 @@ static void dissect_ASIdentifiers_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-pkix1explicit-fn.c ---*/
-#line 101 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
+#line 104 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
 
 
 /*--- proto_register_pkix1explicit ----------------------------------------------*/
@@ -1005,7 +1008,7 @@ void proto_register_pkix1explicit(void) {
         "ASId", HFILL }},
 
 /*--- End of included file: packet-pkix1explicit-hfarr.c ---*/
-#line 120 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
+#line 123 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
   };
 
   /* List of subtrees */
@@ -1038,7 +1041,7 @@ void proto_register_pkix1explicit(void) {
     &ett_pkix1explicit_ASRange,
 
 /*--- End of included file: packet-pkix1explicit-ettarr.c ---*/
-#line 126 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
+#line 129 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
   };
 
   /* Register protocol */
@@ -1065,6 +1068,6 @@ void proto_reg_handoff_pkix1explicit(void) {
 
 
 /*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/
-#line 143 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
+#line 146 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c"
 }
 
diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c
index 417a9658d1..1f05b8f3ed 100644
--- a/epan/dissectors/packet-tetra.c
+++ b/epan/dissectors/packet-tetra.c
@@ -55,7 +55,7 @@
 #define PROTO_TAG_tetra	"TETRA"
 
 void proto_register_tetra(void);
-void proto_reg_handoff_ldap(void);
+void proto_reg_handoff_tetra(void);
 
 /* Wireshark ID of the tetra protocol */
 static int proto_tetra = -1;