diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-12-10 06:01:16 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-12-10 06:01:16 +0000 |
commit | acf2fed688cc9d80e6f236931adf468554dd0ce1 (patch) | |
tree | 502b76119050d4aa73cc46cfc87db8037e2af0c1 /epan | |
parent | af4cbd00a024d4b90f2ad2e36afc38d8c8aa702e (diff) |
- Forward declaration of register functions.
svn path=/trunk/; revision=53901
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-HI2Operations.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-atn-cm.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-atn-cpdlc.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-atn-ulcs.c | 15 | ||||
-rw-r--r-- | epan/dissectors/packet-c1222.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-cmp.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-xmpp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-xtp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-ymsg.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-ypbind.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-yppasswd.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-ypserv.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-ypxfr.c | 3 |
13 files changed, 63 insertions, 29 deletions
diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index f77f6f85e2..218623a4bf 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -45,8 +45,8 @@ #define PSNAME "HI2OPERATIONS" #define PFNAME "hi2operations" -void proto_register_hi2operations(void); -void proto_reg_handoff_hi2operations(void); +void proto_register_HI2Operations(void); +void proto_reg_handoff_HI2Operations(void); /* Initialize the protocol and registered fields */ int proto_HI2Operations = -1; diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c index c1aad136a7..42652f6a2b 100644 --- a/epan/dissectors/packet-atn-cm.c +++ b/epan/dissectors/packet-atn-cm.c @@ -71,6 +71,9 @@ #define ATN_CM_PROTO "ICAO Doc9705 CM" +void proto_register_atn_cm(void); +void proto_reg_handoff_atn_cm(void); + /*--- Included file: packet-atn-cm-hf.c ---*/ #line 1 "../../asn1/atn-cm/packet-atn-cm-hf.c" @@ -116,7 +119,7 @@ static int hf_atn_cm_hours = -1; /* Timehours */ static int hf_atn_cm_minutes = -1; /* Timeminutes */ /*--- End of included file: packet-atn-cm-hf.c ---*/ -#line 67 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 70 "../../asn1/atn-cm/packet-atn-cm-template.c" /*--- Included file: packet-atn-cm-ett.c ---*/ @@ -138,7 +141,7 @@ static gint ett_atn_cm_ShortTsap = -1; static gint ett_atn_cm_Time = -1; /*--- End of included file: packet-atn-cm-ett.c ---*/ -#line 69 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 72 "../../asn1/atn-cm/packet-atn-cm-template.c" static gint ett_atn_cm = -1; @@ -635,7 +638,7 @@ static void dissect_CMGroundMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U /*--- End of included file: packet-atn-cm-fn.c ---*/ -#line 72 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 75 "../../asn1/atn-cm/packet-atn-cm-template.c" static int proto_atn_cm = -1; static int @@ -944,7 +947,7 @@ void proto_register_atn_cm (void) "Timeminutes", HFILL }}, /*--- End of included file: packet-atn-cm-hfarr.c ---*/ -#line 216 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 219 "../../asn1/atn-cm/packet-atn-cm-template.c" }; static gint *ett[] = { @@ -967,7 +970,7 @@ void proto_register_atn_cm (void) &ett_atn_cm_Time, /*--- End of included file: packet-atn-cm-ettarr.c ---*/ -#line 219 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 222 "../../asn1/atn-cm/packet-atn-cm-template.c" &ett_atn_cm }; diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c index 95de71cb35..c24d64db9c 100644 --- a/epan/dissectors/packet-atn-cpdlc.c +++ b/epan/dissectors/packet-atn-cpdlc.c @@ -73,6 +73,9 @@ #define ATN_CPDLC_PROTO "ICAO Doc9705 CPDLC" +void proto_register_atn_cpdlc(void); +void proto_reg_handoff_atn_cpdlc(void); + static const char *object_identifier_id; /* forward declarations */ @@ -699,7 +702,7 @@ static int hf_atn_cpdlc_windSpeedEnglish = -1; /* WindSpeedEnglish */ static int hf_atn_cpdlc_windSpeedMetric = -1; /* WindSpeedMetric */ /*--- End of included file: packet-atn-cpdlc-hf.c ---*/ -#line 89 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 92 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /*--- Included file: packet-atn-cpdlc-ett.c ---*/ @@ -848,7 +851,7 @@ static gint ett_atn_cpdlc_Winds = -1; static gint ett_atn_cpdlc_WindSpeed = -1; /*--- End of included file: packet-atn-cpdlc-ett.c ---*/ -#line 91 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 94 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" static gint ett_atn_cpdlc = -1; @@ -5287,7 +5290,7 @@ static void dissect_ProtectedAircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-atn-cpdlc-fn.c ---*/ -#line 94 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 97 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /* Wireshark ID of CPDLC protocol */ static int proto_atn_cpdlc = -1; @@ -7917,7 +7920,7 @@ void proto_register_atn_cpdlc (void) NULL, HFILL }}, /*--- End of included file: packet-atn-cpdlc-hfarr.c ---*/ -#line 315 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 318 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" }; static gint *ett[] = { @@ -8068,7 +8071,7 @@ void proto_register_atn_cpdlc (void) &ett_atn_cpdlc_WindSpeed, /*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/ -#line 319 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 322 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" &ett_atn_cpdlc }; diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index 83acfb158f..d536eff0e1 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -140,6 +140,9 @@ which ATN standard is supported ? #define ATN_ACSE_PROTO "ICAO Doc9705 ULCS ACSE (ISO 8649/8650-1:1996)" #define ATN_ULCS_PROTO "ICAO Doc9705 ULCS" +void proto_register_atn_ulcs(void); +void proto_reg_handoff_atn_ulcs(void); + static heur_dissector_list_t atn_ulcs_heur_subdissector_list; /* presentation subdissectors i.e. CM, CPDLC */ @@ -276,7 +279,7 @@ static int hf_atn_ulcs_ACSE_requirements_authentication = -1; static int hf_atn_ulcs_ACSE_requirements_application_context_negotiation = -1; /*--- End of included file: packet-atn-ulcs-hf.c ---*/ -#line 194 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 197 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" /*--- Included file: packet-atn-ulcs-ett.c ---*/ @@ -308,7 +311,7 @@ static gint ett_atn_ulcs_RelativeDistinguishedName = -1; static gint ett_atn_ulcs_AttributeTypeAndValue = -1; /*--- End of included file: packet-atn-ulcs-ett.c ---*/ -#line 196 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 199 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" static gint ett_atn_ulcs = -1; static gint ett_atn_acse = -1; @@ -1592,7 +1595,7 @@ static void dissect_ACSE_apdu_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-atn-ulcs-fn.c ---*/ -#line 200 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 203 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" #if 0 /* re-implementing external data: packet-per.c */ @@ -1739,7 +1742,7 @@ static int atn_ulcs_Externalt_encoding( } /* re-implementing external data: packet-per.c */ -guint32 atn_per_external_type( +static guint32 atn_per_external_type( tvbuff_t *tvb _U_, guint32 offset, asn1_ctx_t *actx, @@ -2495,7 +2498,7 @@ void proto_register_atn_ulcs (void) NULL, HFILL }}, /*--- End of included file: packet-atn-ulcs-hfarr.c ---*/ -#line 810 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 813 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" {&hf_atn_ses_type, { "SPDU Type", "atn-ulcs.ses.type", @@ -2575,7 +2578,7 @@ void proto_register_atn_ulcs (void) &ett_atn_ulcs_AttributeTypeAndValue, /*--- End of included file: packet-atn-ulcs-ettarr.c ---*/ -#line 860 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 863 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" &ett_atn_ses, &ett_atn_pres, &ett_atn_acse, diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index df2b111704..df980877f4 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -89,6 +89,8 @@ #define C1222_CMD_WAIT 0x70 #define C1222_CMD_TIMING_SETUP 0x71 +void proto_register_c1222(void); + static dissector_handle_t c1222_handle=NULL; static dissector_handle_t c1222_udp_handle=NULL; @@ -131,7 +133,7 @@ static int hf_c1222_c1221_auth_request = -1; /* OCTET_STRING_SIZE_1_255 */ static int hf_c1222_c1221_auth_response = -1; /* OCTET_STRING_SIZE_CONSTR002 */ /*--- End of included file: packet-c1222-hf.c ---*/ -#line 97 "../../asn1/c1222/packet-c1222-template.c" +#line 99 "../../asn1/c1222/packet-c1222-template.c" /* These are the EPSEM pieces */ /* first, the flag components */ static int hf_c1222_epsem_flags = -1; @@ -237,7 +239,7 @@ static gint ett_c1222_Calling_authentication_value_c1222_U = -1; static gint ett_c1222_Calling_authentication_value_c1221_U = -1; /*--- End of included file: packet-c1222-ett.c ---*/ -#line 190 "../../asn1/c1222/packet-c1222-template.c" +#line 192 "../../asn1/c1222/packet-c1222-template.c" static expert_field ei_c1222_command_truncated = EI_INIT; static expert_field ei_c1222_bad_checksum = EI_INIT; @@ -1567,7 +1569,7 @@ static void dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-c1222-fn.c ---*/ -#line 1051 "../../asn1/c1222/packet-c1222-template.c" +#line 1053 "../../asn1/c1222/packet-c1222-template.c" /** * Dissects a a full (reassembled) C12.22 message. @@ -1957,7 +1959,7 @@ void proto_register_c1222(void) { "OCTET_STRING_SIZE_CONSTR002", HFILL }}, /*--- End of included file: packet-c1222-hfarr.c ---*/ -#line 1336 "../../asn1/c1222/packet-c1222-template.c" +#line 1338 "../../asn1/c1222/packet-c1222-template.c" }; /* List of subtrees */ @@ -1980,7 +1982,7 @@ void proto_register_c1222(void) { &ett_c1222_Calling_authentication_value_c1221_U, /*--- End of included file: packet-c1222-ettarr.c ---*/ -#line 1346 "../../asn1/c1222/packet-c1222-template.c" +#line 1348 "../../asn1/c1222/packet-c1222-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 9f35ab30ba..3b988d0e48 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -56,6 +56,8 @@ #define TCP_PORT_CMP 829 +void proto_register_cmp(void); + /* desegmentation of CMP over TCP */ static gboolean cmp_desegment = TRUE; @@ -236,7 +238,7 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1; static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1; /*--- End of included file: packet-cmp-hf.c ---*/ -#line 69 "../../asn1/cmp/packet-cmp-template.c" +#line 71 "../../asn1/cmp/packet-cmp-template.c" /* Initialize the subtree pointers */ static gint ett_cmp = -1; @@ -292,7 +294,7 @@ static gint ett_cmp_PollRepContent = -1; static gint ett_cmp_PollRepContent_item = -1; /*--- End of included file: packet-cmp-ett.c ---*/ -#line 73 "../../asn1/cmp/packet-cmp-template.c" +#line 75 "../../asn1/cmp/packet-cmp-template.c" /*--- Included file: packet-cmp-fn.c ---*/ #line 1 "../../asn1/cmp/packet-cmp-fn.c" @@ -1452,7 +1454,7 @@ static void dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-cmp-fn.c ---*/ -#line 74 "../../asn1/cmp/packet-cmp-template.c" +#line 76 "../../asn1/cmp/packet-cmp-template.c" static int dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx) @@ -2337,7 +2339,7 @@ void proto_register_cmp(void) { NULL, HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 326 "../../asn1/cmp/packet-cmp-template.c" +#line 328 "../../asn1/cmp/packet-cmp-template.c" }; /* List of subtrees */ @@ -2395,7 +2397,7 @@ void proto_register_cmp(void) { &ett_cmp_PollRepContent_item, /*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 332 "../../asn1/cmp/packet-cmp-template.c" +#line 334 "../../asn1/cmp/packet-cmp-template.c" }; module_t *cmp_module; @@ -2489,7 +2491,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 404 "../../asn1/cmp/packet-cmp-template.c" +#line 406 "../../asn1/cmp/packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index fd01568ab1..77f17ea8c9 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -44,6 +44,9 @@ #define XMPP_PORT 5222 +void proto_register_xmpp(void); +void proto_reg_handoff_xmpp(void); + int proto_xmpp = -1; static gboolean xmpp_desegment = TRUE; diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index ee7b00ba19..cc0b203529 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -86,6 +86,9 @@ #define XTP_KEY_RTN ((guint64)1<<63) +void proto_register_xtp(void); +void proto_reg_handoff_xtp(void); + /** packet structures definition **/ struct xtp_cntl { guint64 rseq; diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index fbc071bc58..91d949fcc1 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -32,6 +32,9 @@ #include "packet-tcp.h" #include <epan/prefs.h> +void proto_register_ymsg(void); +void proto_reg_handoff_ymsg(void); + static int proto_ymsg = -1; static int hf_ymsg_version = -1; static int hf_ymsg_vendor = -1; diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c index c4b97527e9..02af71f904 100644 --- a/epan/dissectors/packet-ypbind.c +++ b/epan/dissectors/packet-ypbind.c @@ -33,6 +33,9 @@ #include "packet-rpc.h" #include "packet-ypbind.h" +void proto_register_ypbind(void); +void proto_reg_handoff_ypbind(void); + static int proto_ypbind = -1; static int hf_ypbind_procedure_v1 = -1; static int hf_ypbind_procedure_v2 = -1; diff --git a/epan/dissectors/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c index c3a8448400..e5d0eb419a 100644 --- a/epan/dissectors/packet-yppasswd.c +++ b/epan/dissectors/packet-yppasswd.c @@ -29,6 +29,9 @@ #include "packet-rpc.h" #include "packet-yppasswd.h" +void proto_register_yppasswd(void); +void proto_reg_handoff_yppasswd(void); + static int proto_yppasswd = -1; static int hf_yppasswd_procedure_v1 = -1; static int hf_yppasswd_status = -1; diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index 8a0faa2ae3..eefb501f08 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -34,6 +34,9 @@ #include "packet-rpc.h" #include "packet-ypserv.h" +void proto_register_ypserv(void); +void proto_reg_handoff_ypserv(void); + static int proto_ypserv = -1; static int hf_ypserv_procedure_v1 = -1; static int hf_ypserv_procedure_v2 = -1; diff --git a/epan/dissectors/packet-ypxfr.c b/epan/dissectors/packet-ypxfr.c index bfa0145da9..54b1612c20 100644 --- a/epan/dissectors/packet-ypxfr.c +++ b/epan/dissectors/packet-ypxfr.c @@ -31,6 +31,9 @@ #include "packet-rpc.h" #include "packet-ypxfr.h" +void proto_register_ypxfr(void); +void proto_reg_handoff_ypxfr(void); + static int proto_ypxfr = -1; static int hf_ypxfr_procedure_v1 = -1; |