From b693f74b891484ca335c52136224df2c532c2521 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Mon, 9 Dec 2013 06:50:09 +0000 Subject: - Forward declaration of register functions. svn path=/trunk/; revision=53877 --- epan/dissectors/packet-HI2Operations.c | 13 ++++++++----- epan/dissectors/packet-acse.c | 14 ++++++++------ epan/dissectors/packet-cms.c | 15 +++++++++------ epan/dissectors/packet-dap.c | 21 ++++++++++++--------- epan/dissectors/packet-ftam.c | 13 ++++++++----- epan/dissectors/packet-h245.c | 14 ++++++++------ 6 files changed, 53 insertions(+), 37 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index b1eefb6c4d..f77f6f85e2 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -45,6 +45,9 @@ #define PSNAME "HI2OPERATIONS" #define PFNAME "hi2operations" +void proto_register_hi2operations(void); +void proto_reg_handoff_hi2operations(void); + /* Initialize the protocol and registered fields */ int proto_HI2Operations = -1; @@ -366,7 +369,7 @@ static int hf_HI2Operations_cI = -1; /* CellIdType */ static int hf_HI2Operations_ssi = -1; /* SSIType */ /*--- End of included file: packet-HI2Operations-hf.c ---*/ -#line 43 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 46 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /* Initialize the subtree pointers */ @@ -476,7 +479,7 @@ static gint ett_HI2Operations_TETRACGIType = -1; static gint ett_HI2Operations_TSIType = -1; /*--- End of included file: packet-HI2Operations-ett.c ---*/ -#line 46 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 49 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /*--- Included file: packet-HI2Operations-fn.c ---*/ @@ -3765,7 +3768,7 @@ static void dissect_IRIsContent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-HI2Operations-fn.c ---*/ -#line 48 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 51 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /*--- proto_register_HI2Operations ----------------------------------------------*/ @@ -5034,7 +5037,7 @@ void proto_register_HI2Operations(void) { "SSIType", HFILL }}, /*--- End of included file: packet-HI2Operations-hfarr.c ---*/ -#line 56 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 59 "../../asn1/HI2Operations/packet-HI2Operations-template.c" }; /* List of subtrees */ @@ -5146,7 +5149,7 @@ void proto_register_HI2Operations(void) { &ett_HI2Operations_TSIType, /*--- End of included file: packet-HI2Operations-ettarr.c ---*/ -#line 61 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 64 "../../asn1/HI2Operations/packet-HI2Operations-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index d1d6c57048..d526285fd2 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -68,9 +68,11 @@ #define CLPSNAME "CLACSE" #define CLPFNAME "clacse" - #define ACSE_APDU_OID "2.2.1.0.1" +void proto_register_acse(void); +void proto_reg_handoff_acse(void); + /* Initialize the protocol and registered fields */ int proto_acse = -1; int proto_clacse = -1; @@ -190,7 +192,7 @@ static int hf_acse_ACSE_requirements_higher_level_association = -1; static int hf_acse_ACSE_requirements_nested_association = -1; /*--- End of included file: packet-acse-hf.c ---*/ -#line 73 "../../asn1/acse/packet-acse-template.c" +#line 75 "../../asn1/acse/packet-acse-template.c" /* Initialize the subtree pointers */ static gint ett_acse = -1; @@ -234,7 +236,7 @@ static gint ett_acse_Authentication_value_other = -1; static gint ett_acse_Authentication_value = -1; /*--- End of included file: packet-acse-ett.c ---*/ -#line 77 "../../asn1/acse/packet-acse-template.c" +#line 79 "../../asn1/acse/packet-acse-template.c" static expert_field ei_acse_dissector_not_available = EI_INIT; @@ -1691,7 +1693,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ /*--- End of included file: packet-acse-fn.c ---*/ -#line 153 "../../asn1/acse/packet-acse-template.c" +#line 155 "../../asn1/acse/packet-acse-template.c" /* @@ -2239,7 +2241,7 @@ void proto_register_acse(void) { NULL, HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 268 "../../asn1/acse/packet-acse-template.c" +#line 270 "../../asn1/acse/packet-acse-template.c" }; /* List of subtrees */ @@ -2285,7 +2287,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 274 "../../asn1/acse/packet-acse-template.c" +#line 276 "../../asn1/acse/packet-acse-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index c7943ac4c7..e0f7213620 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -57,6 +57,9 @@ #define PSNAME "CMS" #define PFNAME "cms" +void proto_register_cms(void); +void proto_reg_handoff_cms(void); + /* Initialize the protocol and registered fields */ static int proto_cms = -1; static int hf_cms_ci_contentType = -1; @@ -188,7 +191,7 @@ static int hf_cms_issuerUniqueID = -1; /* UniqueIdentifier */ static int hf_cms_extensions = -1; /* Extensions */ /*--- End of included file: packet-cms-hf.c ---*/ -#line 56 "../../asn1/cms/packet-cms-template.c" +#line 59 "../../asn1/cms/packet-cms-template.c" /* Initialize the subtree pointers */ @@ -250,7 +253,7 @@ static gint ett_cms_T_subject = -1; static gint ett_cms_SEQUENCE_OF_Attribute = -1; /*--- End of included file: packet-cms-ett.c ---*/ -#line 59 "../../asn1/cms/packet-cms-template.c" +#line 62 "../../asn1/cms/packet-cms-template.c" static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */ @@ -1824,7 +1827,7 @@ static void dissect_RC2CBCParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-cms-fn.c ---*/ -#line 137 "../../asn1/cms/packet-cms-template.c" +#line 140 "../../asn1/cms/packet-cms-template.c" /*--- proto_register_cms ----------------------------------------------*/ void proto_register_cms(void) { @@ -2332,7 +2335,7 @@ void proto_register_cms(void) { NULL, HFILL }}, /*--- End of included file: packet-cms-hfarr.c ---*/ -#line 148 "../../asn1/cms/packet-cms-template.c" +#line 151 "../../asn1/cms/packet-cms-template.c" }; /* List of subtrees */ @@ -2396,7 +2399,7 @@ void proto_register_cms(void) { &ett_cms_SEQUENCE_OF_Attribute, /*--- End of included file: packet-cms-ettarr.c ---*/ -#line 153 "../../asn1/cms/packet-cms-template.c" +#line 156 "../../asn1/cms/packet-cms-template.c" }; /* Register protocol */ @@ -2442,7 +2445,7 @@ void proto_reg_handoff_cms(void) { /*--- End of included file: packet-cms-dis-tab.c ---*/ -#line 175 "../../asn1/cms/packet-cms-template.c" +#line 178 "../../asn1/cms/packet-cms-template.c" oid_add_from_string("id-data","1.2.840.113549.1.7.1"); oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7"); diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index bcdb538587..fc7df72437 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -60,6 +60,9 @@ #define PSNAME "DAP" #define PFNAME "dap" +void proto_register_dap(void); +void proto_reg_handoff_dap(void); + static guint global_dap_tcp_port = 102; static dissector_handle_t tpkt_handle; static void prefs_register_dap(void); /* forward declaration for use in preferences registration */ @@ -479,7 +482,7 @@ static int hf_dap_SearchControlOptions_separateFamilyMembers = -1; static int hf_dap_SearchControlOptions_searchFamily = -1; /*--- End of included file: packet-dap-hf.c ---*/ -#line 65 "../../asn1/dap/packet-dap-template.c" +#line 68 "../../asn1/dap/packet-dap-template.c" /* Initialize the subtree pointers */ static gint ett_dap = -1; @@ -658,7 +661,7 @@ static gint ett_dap_UpdateError = -1; static gint ett_dap_T_signedUpdateError = -1; /*--- End of included file: packet-dap-ett.c ---*/ -#line 69 "../../asn1/dap/packet-dap-template.c" +#line 72 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-val.h ---*/ @@ -683,7 +686,7 @@ static gint ett_dap_T_signedUpdateError = -1; #define id_errcode_dsaReferral 9 /*--- End of included file: packet-dap-val.h ---*/ -#line 71 "../../asn1/dap/packet-dap-template.c" +#line 74 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table.c ---*/ @@ -721,7 +724,7 @@ static const value_string dap_err_code_string_vals[] = { /*--- End of included file: packet-dap-table.c ---*/ -#line 73 "../../asn1/dap/packet-dap-template.c" +#line 76 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-fn.c ---*/ @@ -4776,7 +4779,7 @@ static int dissect_UpdateError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-dap-fn.c ---*/ -#line 75 "../../asn1/dap/packet-dap-template.c" +#line 78 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table11.c ---*/ @@ -4808,7 +4811,7 @@ static const ros_opr_t dap_opr_tab[] = { /*--- End of included file: packet-dap-table11.c ---*/ -#line 77 "../../asn1/dap/packet-dap-template.c" +#line 80 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table21.c ---*/ #line 1 "../../asn1/dap/packet-dap-table21.c" @@ -4837,7 +4840,7 @@ static const ros_err_t dap_err_tab[] = { /*--- End of included file: packet-dap-table21.c ---*/ -#line 78 "../../asn1/dap/packet-dap-template.c" +#line 81 "../../asn1/dap/packet-dap-template.c" static const ros_info_t dap_ros_info = { "DAP", @@ -6477,7 +6480,7 @@ void proto_register_dap(void) { NULL, HFILL }}, /*--- End of included file: packet-dap-hfarr.c ---*/ -#line 97 "../../asn1/dap/packet-dap-template.c" +#line 100 "../../asn1/dap/packet-dap-template.c" }; /* List of subtrees */ @@ -6658,7 +6661,7 @@ void proto_register_dap(void) { &ett_dap_T_signedUpdateError, /*--- End of included file: packet-dap-ettarr.c ---*/ -#line 103 "../../asn1/dap/packet-dap-template.c" +#line 106 "../../asn1/dap/packet-dap-template.c" }; module_t *dap_module; diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 21d2807a45..bba2f67be8 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -51,6 +51,9 @@ #define PSNAME "FTAM" #define PFNAME "ftam" +void proto_register_ftam(void); +void proto_reg_handoff_ftam(void); + /* Initialize the protocol and registered fields */ static int proto_ftam = -1; @@ -480,7 +483,7 @@ static int hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS = -1; static int hf_ftam_Attribute_Names_read_private_use = -1; /*--- End of included file: packet-ftam-hf.c ---*/ -#line 56 "../../asn1/ftam/packet-ftam-template.c" +#line 59 "../../asn1/ftam/packet-ftam-template.c" /* Initialize the subtree pointers */ static gint ett_ftam = -1; @@ -651,7 +654,7 @@ static gint ett_ftam_Attribute_Names = -1; static gint ett_ftam_AE_title = -1; /*--- End of included file: packet-ftam-ett.c ---*/ -#line 60 "../../asn1/ftam/packet-ftam-template.c" +#line 63 "../../asn1/ftam/packet-ftam-template.c" /*--- Included file: packet-ftam-fn.c ---*/ @@ -4743,7 +4746,7 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a /*--- End of included file: packet-ftam-fn.c ---*/ -#line 62 "../../asn1/ftam/packet-ftam-template.c" +#line 65 "../../asn1/ftam/packet-ftam-template.c" /* * Dissect FTAM unstructured text @@ -6468,7 +6471,7 @@ void proto_register_ftam(void) { NULL, HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 126 "../../asn1/ftam/packet-ftam-template.c" +#line 129 "../../asn1/ftam/packet-ftam-template.c" }; /* List of subtrees */ @@ -6641,7 +6644,7 @@ void proto_register_ftam(void) { &ett_ftam_AE_title, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 132 "../../asn1/ftam/packet-ftam-template.c" +#line 135 "../../asn1/ftam/packet-ftam-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 8eacd7a752..4710c1c575 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -68,6 +68,8 @@ #define PSNAME "H.245" #define PFNAME "h245" +void proto_register_h245(void); +void proto_reg_handoff_h245(void); static dissector_handle_t rtcp_handle=NULL; static dissector_table_t nsp_object_dissector_table; @@ -214,7 +216,7 @@ typedef enum _IndicationMessage_enum { } IndicationMessage_enum; /*--- End of included file: packet-h245-val.h ---*/ -#line 87 "../../asn1/h245/packet-h245-template.c" +#line 89 "../../asn1/h245/packet-h245-template.c" static const value_string h245_RequestMessage_short_vals[] = { { RequestMessage_nonStandard , "NSM" }, @@ -1925,7 +1927,7 @@ static int hf_h245_encrypted = -1; /* OCTET_STRING */ static int hf_h245_encryptedAlphanumeric = -1; /* EncryptedAlphanumeric */ /*--- End of included file: packet-h245-hf.c ---*/ -#line 391 "../../asn1/h245/packet-h245-template.c" +#line 393 "../../asn1/h245/packet-h245-template.c" /* Initialize the subtree pointers */ static int ett_h245 = -1; @@ -2426,7 +2428,7 @@ static gint ett_h245_FlowControlIndication = -1; static gint ett_h245_MobileMultilinkReconfigurationIndication = -1; /*--- End of included file: packet-h245-ett.c ---*/ -#line 396 "../../asn1/h245/packet-h245-template.c" +#line 398 "../../asn1/h245/packet-h245-template.c" /* Forward declarations */ static int dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -14493,7 +14495,7 @@ static void dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-h245-fn.c ---*/ -#line 405 "../../asn1/h245/packet-h245-template.c" +#line 407 "../../asn1/h245/packet-h245-template.c" static void dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) @@ -20187,7 +20189,7 @@ void proto_register_h245(void) { NULL, HFILL }}, /*--- End of included file: packet-h245-hfarr.c ---*/ -#line 486 "../../asn1/h245/packet-h245-template.c" +#line 488 "../../asn1/h245/packet-h245-template.c" }; /* List of subtrees */ @@ -20690,7 +20692,7 @@ void proto_register_h245(void) { &ett_h245_MobileMultilinkReconfigurationIndication, /*--- End of included file: packet-h245-ettarr.c ---*/ -#line 493 "../../asn1/h245/packet-h245-template.c" +#line 495 "../../asn1/h245/packet-h245-template.c" }; module_t *h245_module; -- cgit v1.2.3