diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-12-11 06:10:45 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-12-11 06:10:45 +0000 |
commit | 07c5bb348069338654711da1596057e7ae0121f2 (patch) | |
tree | 5a8b0f1ff24c2f350c0a4d348b3c93ee9b8c10d5 /epan | |
parent | a155364c778ada7dfbe241cc2b4c0488093b0834 (diff) |
- Forward declaration of register functions.
svn path=/trunk/; revision=53930
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-sml.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-smpp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-socketcan.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-stanag4607.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-t30.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-tcp.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-tdmoe.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-teamspeak2.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-tn3270.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-trmac.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-uhd.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-vlan.c | 2 |
14 files changed, 28 insertions, 14 deletions
diff --git a/epan/dissectors/packet-sml.c b/epan/dissectors/packet-sml.c index 7d747ae21d..118c003db5 100644 --- a/epan/dissectors/packet-sml.c +++ b/epan/dissectors/packet-sml.c @@ -79,6 +79,7 @@ static guint tcp_port_pref = TCP_PORT_SML; static guint udp_port_pref = UDP_PORT_SML; /* Forward declaration we need below (if using proto_reg_handoff as a prefs callback)*/ +void proto_register_sml(void); void proto_reg_handoff_sml(void); /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index e880751326..ae843d31d2 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -1108,7 +1108,7 @@ static dissector_handle_t gsm_sms_handle; /* * For Stats Tree */ -void +static void smpp_stats_tree_init(stats_tree* st) { st_smpp_ops = stats_tree_create_node(st, "SMPP Operations", 0, TRUE); @@ -1118,7 +1118,7 @@ smpp_stats_tree_init(stats_tree* st) } -int +static int smpp_stats_tree_per_packet(stats_tree *st, /* st as it was passed to us */ packet_info *pinfo _U_, epan_dissect_t *edt _U_, diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index 94153768cd..c6ca25ed83 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -76,7 +76,7 @@ typedef enum { CAN_DATA_DISSECTOR = 1, CAN_CANOPEN_DISSECTOR = 2, CAN_DEVICENET_DISSECTOR = 3, - CAN_J1939_DISSECTOR = 4, + CAN_J1939_DISSECTOR = 4 } Dissector_Option; /* Structure that gets passed between dissectors. Since it's just a simple 32-bit diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 987df803e1..f6f1ef6d19 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1611,7 +1611,7 @@ _gcry_rsa_decrypt (int algo, gcry_mpi_t *result, gcry_mpi_t *data, #define PUBKEY_FLAG_NO_BLINDING (1 << 0) -const gchar* +static const gchar* ssl_private_key_to_str(SSL_PRIVATE_KEY* pk) { const gchar *str = "NULL"; @@ -1633,7 +1633,7 @@ ssl_private_key_to_str(SSL_PRIVATE_KEY* pk) /* decrypt data with private key. Store decrypted data directly into input * buffer */ -int +static int ssl_private_decrypt(guint len, guchar* encr_data, SSL_PRIVATE_KEY* pk) { gint rc; @@ -2813,7 +2813,7 @@ tls_check_mac(SslDecoder*decoder, gint ct, gint ver, guint8* data, return 0; } -int +static int ssl3_check_mac(SslDecoder*decoder,int ct,guint8* data, guint32 datalen, guint8* mac) { @@ -2926,7 +2926,7 @@ dtls_check_mac(SslDecoder*decoder, gint ct,int ver, guint8* data, } #ifdef HAVE_LIBZ -int +static int ssl_decompress_record(SslDecompress* decomp, const guchar* in, guint inl, StringInfo* out_str, guint* outl) { gint err; @@ -3186,7 +3186,7 @@ skip_mac: } #define RSA_PARS 6 -SSL_PRIVATE_KEY* +static SSL_PRIVATE_KEY* ssl_privkey_to_sexp(struct gnutls_x509_privkey_int* priv_key) { gnutls_datum_t rsa_datum[RSA_PARS]; /* m, e, d, p, q, u */ diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 669473b72e..67b7c556cc 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -112,6 +112,8 @@ #include <epan/uat.h> #include <epan/exported_pdu.h> +void proto_register_ssl(void); + static ssldecrypt_assoc_t *sslkeylist_uats = NULL; static guint nssldecrypt = 0; diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index 9f5b96f6e8..f4834dee59 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -29,6 +29,9 @@ #include <wiretap/stanag4607.h> +void proto_register_stanag4607(void); +void proto_reg_handoff_stanag4607(void); + static int proto_stanag4607 = -1; static int hf_4607_version = -1; diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c index 341e2479fd..d29fd98fed 100644 --- a/epan/dissectors/packet-t30.c +++ b/epan/dissectors/packet-t30.c @@ -37,6 +37,7 @@ #include "packet-t38.h" #include "packet-t30.h" +void proto_register_t30(void); void proto_reg_handoff_t30(void); /* T30 */ diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 5c0873f837..fcca74f9f0 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -48,6 +48,9 @@ #include "packet-ip.h" #include "packet-icmp.h" +void proto_register_tcp(void); +void proto_reg_handoff_tcp(void); + static int tcp_tap = -1; /* Place TCP summary in proto tree */ @@ -517,7 +520,7 @@ process_tcp_payload(tvbuff_t *tvb, volatile int offset, packet_info *pinfo, struct tcp_analysis *tcpd, struct tcpinfo *tcpinfo); -struct tcp_analysis * +static struct tcp_analysis * init_tcp_conversation_data(packet_info *pinfo) { struct tcp_analysis *tcpd; diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c index f433cb9119..b199bced5d 100644 --- a/epan/dissectors/packet-tdmoe.c +++ b/epan/dissectors/packet-tdmoe.c @@ -58,8 +58,6 @@ static dissector_handle_t data_handle; static gint pref_tdmoe_d_channel = 24; -void proto_reg_handoff_tdmoe(void); - static int dissect_tdmoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 9dea2b14ff..3639237bf8 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -106,8 +106,8 @@ #define TS2_STATUS_MUTEMICROPHONE 16 #define TS2_STATUS_MUTE 32 -void proto_reg_handoff_teamspeak2(void); -void proto_register_teamspeak2(void); +void proto_reg_handoff_ts2(void); +void proto_register_ts2(void); static int hf_msg_fragments = -1; static int hf_msg_fragment = -1; diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index 35777e2b50..5c8190d832 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -59,6 +59,8 @@ #include "packet-tn3270.h" +void proto_register_tn3270(void); + /* Note well: * In the IBM "3270 Information Display System: Data Stream Programmer's Reference" * document, the references to bit numbers in the text and tables diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 12ee053d24..885dfbe2da 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -31,6 +31,8 @@ #include <epan/to_str.h> #include <epan/expert.h> +void proto_register_trmac(void); + static int proto_trmac = -1; static int hf_trmac_mv = -1; static int hf_trmac_length = -1; diff --git a/epan/dissectors/packet-uhd.c b/epan/dissectors/packet-uhd.c index 19ce30d7cf..3d559b205d 100644 --- a/epan/dissectors/packet-uhd.c +++ b/epan/dissectors/packet-uhd.c @@ -36,6 +36,8 @@ #include <epan/packet.h> #include <epan/prefs.h> +void proto_register_uhd(void); + static gint dissector_port_pref = 0; /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */ diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index ddaf98d09b..58fc128c91 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -37,7 +37,7 @@ #include <epan/etypes.h> #include <epan/prefs.h> -void proto_reg_handoff_vlan(void); +void proto_register_vlan(void); void proto_reg_handoff_vlan(void); static unsigned int q_in_q_ethertype = 0x9100; |