diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-12-10 17:41:57 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-12-10 17:41:57 +0000 |
commit | 25ce6c262edc7348ec1057f929630e6862eff47d (patch) | |
tree | 71731c4326d3c41b8759cd4126b76a36b57aa0ff /epan | |
parent | 706c629ae09aabbe3bc3123c1a763868cb51a18b (diff) |
- Forward declaration of register functions.
svn path=/trunk/; revision=53908
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-ldap.c | 60 | ||||
-rw-r--r-- | epan/dissectors/packet-tetra.c | 22 | ||||
-rw-r--r-- | epan/dissectors/packet-wcp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-wfleet-hdlc.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-whois.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-wlccp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-wol.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-wow.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-wreth.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-wsmp.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-wsp.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-wtls.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-wtp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-x25.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-x29.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-xcsl.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-xdmcp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-xmcp.c | 2 |
18 files changed, 92 insertions, 40 deletions
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index f1323d9d21..c2ab579eab 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -753,22 +753,22 @@ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, i guint32 flags; proto_item *item; proto_tree *tree=NULL; - guint fields[] = { - hf_mscldap_ntver_flags_v1, - hf_mscldap_ntver_flags_v5, - hf_mscldap_ntver_flags_v5ex, - hf_mscldap_ntver_flags_v5ep, - hf_mscldap_ntver_flags_vcs, - hf_mscldap_ntver_flags_vnt4, - hf_mscldap_ntver_flags_vpdc, - hf_mscldap_ntver_flags_vip, - hf_mscldap_ntver_flags_vl, - hf_mscldap_ntver_flags_vgc, - 0 }; - guint *field; header_field_info *hfi; gboolean one_bit_set = FALSE; + guint fields[11]; + fields[0] = hf_mscldap_ntver_flags_v1; + fields[1] = hf_mscldap_ntver_flags_v5; + fields[2] = hf_mscldap_ntver_flags_v5ex; + fields[3] = hf_mscldap_ntver_flags_v5ep; + fields[4] = hf_mscldap_ntver_flags_vcs; + fields[5] = hf_mscldap_ntver_flags_vnt4; + fields[6] = hf_mscldap_ntver_flags_vpdc; + fields[7] = hf_mscldap_ntver_flags_vip; + fields[8] = hf_mscldap_ntver_flags_vl; + fields[9] = hf_mscldap_ntver_flags_vgc; + fields[10] = 0; + flags=tvb_get_letohl(tvb, offset); item=proto_tree_add_item(parent_tree, hf_mscldap_ntver_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN); @@ -4332,26 +4332,26 @@ static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb guint32 flags; proto_item *item; proto_tree *tree=NULL; - guint fields[] = { - hf_mscldap_netlogon_flags_fnc, - hf_mscldap_netlogon_flags_dnc, - hf_mscldap_netlogon_flags_dns, - hf_mscldap_netlogon_flags_wdc, - hf_mscldap_netlogon_flags_rodc, - hf_mscldap_netlogon_flags_ndnc, - hf_mscldap_netlogon_flags_good_timeserv, - hf_mscldap_netlogon_flags_writable, - hf_mscldap_netlogon_flags_closest, - hf_mscldap_netlogon_flags_timeserv, - hf_mscldap_netlogon_flags_kdc, - hf_mscldap_netlogon_flags_ds, - hf_mscldap_netlogon_flags_ldap, - hf_mscldap_netlogon_flags_gc, - hf_mscldap_netlogon_flags_pdc, - 0 }; guint *field; header_field_info *hfi; gboolean one_bit_set = FALSE; + guint fields[16]; + fields[0] = hf_mscldap_netlogon_flags_fnc; + fields[1] = hf_mscldap_netlogon_flags_dnc; + fields[2] = hf_mscldap_netlogon_flags_dns; + fields[3] = hf_mscldap_netlogon_flags_wdc; + fields[4] = hf_mscldap_netlogon_flags_rodc; + fields[5] = hf_mscldap_netlogon_flags_ndnc; + fields[6] = hf_mscldap_netlogon_flags_good_timeserv; + fields[7] = hf_mscldap_netlogon_flags_writable; + fields[8] = hf_mscldap_netlogon_flags_closest; + fields[9] = hf_mscldap_netlogon_flags_timeserv; + fields[10] = hf_mscldap_netlogon_flags_kdc; + fields[11] = hf_mscldap_netlogon_flags_ds; + fields[12] = hf_mscldap_netlogon_flags_ldap; + fields[13] = hf_mscldap_netlogon_flags_gc; + fields[14] = hf_mscldap_netlogon_flags_pdc; + fields[15] = 0; flags=tvb_get_letohl(tvb, offset); item=proto_tree_add_item(parent_tree, hf_mscldap_netlogon_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c index 1f05b8f3ed..bfa6ce58f9 100644 --- a/epan/dissectors/packet-tetra.c +++ b/epan/dissectors/packet-tetra.c @@ -9033,12 +9033,12 @@ static void dissect_tetra_UNITDATA_IND(tvbuff_t *tvb, packet_info *pinfo, proto_ pdu_offset = offset + 4; for(i = 0; i < channels; i++) { - gint hf_channel[] = { - hf_tetra_rxchannel1, - hf_tetra_rxchannel2, - hf_tetra_rxchannel3 - }; gint byte_len, bits_len, remaining_bits; + gint hf_channel[3]; + + hf_channel[0] = hf_tetra_rxchannel1; + hf_channel[1] = hf_tetra_rxchannel2; + hf_channel[2] = hf_tetra_rxchannel3; /* Channel type */ channel_type = (rxreg >> ((i + 1) * 4) ) & 0xf; @@ -9063,7 +9063,7 @@ static void dissect_tetra_UNITDATA_IND(tvbuff_t *tvb, packet_info *pinfo, proto_ } } -void dissect_tetra_UNITDATA_REQ(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tetra_tree, int offset) +static void dissect_tetra_UNITDATA_REQ(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tetra_tree, int offset) { guint32 txreg = 0; guint32 channels = 0, i; @@ -9093,8 +9093,12 @@ void dissect_tetra_UNITDATA_REQ(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t pdu_offset = offset + 4; for(i = 0; i < channels; i++) { - gint hf_channel[] = {hf_tetra_channel1, hf_tetra_channel2, hf_tetra_channel3}; gint byte_len, bits_len, remaining_bits; + gint hf_channel[3]; + + hf_channel[0] = hf_tetra_channel1; + hf_channel[1] = hf_tetra_channel2; + hf_channel[2] = hf_tetra_channel3; channel_type = txreg & 0xf; proto_tree_add_uint( tetra_header_tree, hf_channel[i], tvb, offset, 4, channel_type); @@ -11678,7 +11682,7 @@ void proto_register_tetra (void) "T_simplex_duplex_selection_05", HFILL }}, /*--- End of included file: packet-tetra-hfarr.c ---*/ -#line 629 "../../asn1/tetra/packet-tetra-template.c" +#line 633 "../../asn1/tetra/packet-tetra-template.c" }; /* List of subtrees */ @@ -11963,7 +11967,7 @@ void proto_register_tetra (void) &ett_tetra_Modify_type, /*--- End of included file: packet-tetra-ettarr.c ---*/ -#line 639 "../../asn1/tetra/packet-tetra-template.c" +#line 643 "../../asn1/tetra/packet-tetra-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 1f03ba0296..cf813bd17f 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -115,6 +115,9 @@ #define MAX_WCP_BUF_LEN 2048 /* storage size for decompressed data */ #define FROM_DCE 0x80 /* for direction setting */ +void proto_register_wcp(void); +void proto_reg_handoff_wcp(void); + typedef struct { guint8 *buf_cur; diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index e75546fe08..8a32412baa 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/epan/dissectors/packet-wfleet-hdlc.c @@ -32,6 +32,9 @@ #include "packet-chdlc.h" #include "packet-ip.h" +void proto_register_wfleet_hdlc(void); +void proto_reg_handoff_wfleet_hdlc(void); + static int proto_wfleet_hdlc = -1; static int hf_wfleet_hdlc_addr = -1; static int hf_wfleet_hdlc_cmd = -1; diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c index 805a7d5c7e..4783e7d8d2 100644 --- a/epan/dissectors/packet-whois.c +++ b/epan/dissectors/packet-whois.c @@ -32,6 +32,7 @@ #define WHOIS_PORT 43 /* This is the registered IANA port (nicname) */ +void proto_register_whois(void); void proto_reg_handoff_whois(void); static int proto_whois = -1; diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index c111b7ce84..a2017e7798 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -68,6 +68,9 @@ #include <epan/oui.h> #include "packet-llc.h" +void proto_register_wlccp(void); +void proto_reg_handoff_wlccp(void); +void proto_register_wlccp_oui(void); /* The UDP port that WLCCP is expected to ride on */ /* WLCCP also uses an LLC OUI type and an ethertype */ diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index 055b8e0fe9..569887beb0 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -62,6 +62,9 @@ #include <epan/addr_resolv.h> #include <epan/etypes.h> +void proto_register_wol(void); +void proto_reg_handoff_wol(void); + /* Initialize the protocol and registered fields */ static int proto_wol = -1; static int hf_wol_sync = -1; diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index daeb225ec9..63d8eccfc1 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -36,6 +36,9 @@ #include <epan/prefs.h> #include "packet-tcp.h" +void proto_register_wow(void); +void proto_reg_handoff_wow(void); + typedef enum { AUTH_LOGON_CHALLENGE = 0x00, AUTH_LOGON_PROOF = 0x01, diff --git a/epan/dissectors/packet-wreth.c b/epan/dissectors/packet-wreth.c index 51d48b249e..246d1a2dcd 100644 --- a/epan/dissectors/packet-wreth.c +++ b/epan/dissectors/packet-wreth.c @@ -27,6 +27,9 @@ #define WRETH_PORT 0xAAAA +void proto_register_wreth(void); +void proto_reg_handoff_wreth(void); + static void dissect_wreth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static gint WrethIdentPacket(tvbuff_t *tvb, guint8 Offset, packet_info * pInfo, proto_tree * pWrethTree); static gint WrethConnectPacket(tvbuff_t *tvb, guint8 Offset, packet_info * pInfo, proto_tree * pWrethTree); diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index d1538e93af..502e4e79e0 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -39,6 +39,9 @@ #define DATARATE 0x10 #define TRANSMITPW 0x04 +void proto_register_wsmp(void); +void proto_reg_handoff_wsmp(void); + static const value_string wsmp_elemenid_names[] = { { 0x80, "WSMP" }, { 0x81, "WSMP-S" }, @@ -64,7 +67,7 @@ static int hf_wsmp_WSMP_S_data = -1; successive 1s in the most sig bits of the most sig octet. Taken from libwme */ -int wme_getpsidlen (guint8 *psid) +static int wme_getpsidlen (guint8 *psid) { int length = 0; if ((psid[0] & 0xF0) == 0xF0) { diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 1e89f25b44..487ca583ef 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -69,6 +69,12 @@ /* Statistics (see doc/README.tapping) */ #include <epan/tap.h> + +void proto_register_wsp(void); +void proto_reg_handoff_wsp(void); +void proto_register_sir(void); +void proto_reg_handoff_sir(void); + static int wsp_tap = -1; diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index 86770526b9..ed59844d69 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -39,6 +39,9 @@ #include "packet-wap.h" #include "packet-wtls.h" +void proto_register_wtls(void); +void proto_reg_handoff_wtls(void); + /* File scoped variables for the protocol and registered fields */ static int proto_wtls = HF_EMPTY; diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index da81df4e46..6a440336eb 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -42,6 +42,9 @@ #include "packet-wtp.h" #include "packet-wsp.h" +void proto_register_wtp(void); +void proto_reg_handoff_wtp(void); + static const true_false_string continue_truth = { "TPI Present" , "No TPI" diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 3ce0232856..1b2cebb0f4 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -41,6 +41,9 @@ #include <epan/x264_prt_id.h> #include <epan/lapd_sapi.h> +void proto_register_x25(void); +void proto_reg_handoff_x25(void); + /* * Direction of packet. */ diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index 62cea23d95..02820ccd52 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -28,6 +28,9 @@ #include <epan/packet.h> #include <epan/nlpid.h> +void proto_register_x29(void); +void proto_reg_handoff_x29(void); + static int proto_x29 = -1; static int hf_msg_code = -1; static int hf_error_type = -1; diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index dc5054a42c..411655fec7 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -40,6 +40,9 @@ /* string array size */ #define MAXLEN 4096 +void proto_register_xcsl(void); +void proto_reg_handoff_xcsl(void); + /* Initialize the protocol and registered fields */ static header_field_info *hfi_xcsl = NULL; diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index d37a2f97c0..2a4fe0400b 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -52,6 +52,9 @@ #define XDMCP_KEEPALIVE 13 #define XDMCP_ALIVE 14 +void proto_register_xdmcp(void); +void proto_reg_handoff_xdmcp(void); + static const value_string opcode_vals[] = { { XDMCP_BROADCAST_QUERY, "Broadcast_query" }, { XDMCP_QUERY, "Query" }, diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 42af4c73a3..34734d1a2b 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -43,6 +43,8 @@ #include <epan/wmem/wmem.h> #include <epan/expert.h> +void proto_register_xmcp(void); + static dissector_table_t media_type_dissector_table; /* Initialize the protocol and registered fields */ |