diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-03-20 05:59:22 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-20 05:59:22 +0000 |
commit | f92bd64966291dc3c7968d6a1dd7a11f06ba80b3 (patch) | |
tree | 3b9ebb5cf5975442a710da59b07d801a02d46637 /epan/dissectors | |
parent | 0df5a9390d41149dfc87440d72e7669ba96748ec (diff) | |
download | wireshark-f92bd64966291dc3c7968d6a1dd7a11f06ba80b3.tar.gz |
[-Wmissing-prototypes]
Use explicit casts.
svn path=/trunk/; revision=48439
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-ansi_map.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-snmp.c | 23 | ||||
-rw-r--r-- | epan/dissectors/packet-udp.c | 7 |
3 files changed, 29 insertions, 17 deletions
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index f8a10c6678..ce8773618a 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -111,6 +111,10 @@ #define PSNAME "ANSI MAP" #define PFNAME "ansi_map" + +void proto_register_ansi_map(void); +void proto_reg_handoff_ansi_map(void); + /* Preference settings default */ #define MAX_SSN 254 static range_t *global_ssn_range; @@ -877,7 +881,7 @@ static int hf_ansi_map_interSystemSMSDeliveryPointToPointRes = -1; /* InterSyst static int hf_ansi_map_qualificationRequest2Res = -1; /* QualificationRequest2Res */ /*--- End of included file: packet-ansi_map-hf.c ---*/ -#line 321 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 325 "../../asn1/ansi_map/packet-ansi_map-template.c" /* Initialize the subtree pointers */ static gint ett_ansi_map = -1; @@ -1137,7 +1141,7 @@ static gint ett_ansi_map_InvokeData = -1; static gint ett_ansi_map_ReturnData = -1; /*--- End of included file: packet-ansi_map-ett.c ---*/ -#line 353 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 357 "../../asn1/ansi_map/packet-ansi_map-template.c" /* Global variables */ static dissector_table_t is637_tele_id_dissector_table; /* IS-637 Teleservice ID */ @@ -15458,7 +15462,7 @@ dissect_ansi_map_ReturnData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of /*--- End of included file: packet-ansi_map-fn.c ---*/ -#line 3584 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 3588 "../../asn1/ansi_map/packet-ansi_map-template.c" /* * 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301 @@ -16164,7 +16168,7 @@ find_saved_invokedata(asn1_ctx_t *actx){ guint8 *dst_str; char *buf; - buf=ep_alloc(1024); + buf=(char *)ep_alloc(1024); /* Data from the TCAP dissector */ if (actx->pinfo->private_data != NULL){ @@ -19304,7 +19308,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, /*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5237 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 5241 "../../asn1/ansi_map/packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19565,7 +19569,7 @@ void proto_register_ansi_map(void) { &ett_ansi_map_ReturnData, /*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5270 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 5274 "../../asn1/ansi_map/packet-ansi_map-template.c" }; static const enum_val_t ansi_map_response_matching_type_values[] = { diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 6384d7eff4..baea271e5e 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -114,6 +114,11 @@ static int proto_smux = -1; static gboolean display_oid = TRUE; static gboolean snmp_var_in_tree = TRUE; +void proto_register_snmp(void); +void proto_reg_handoff_snmp(void); +void proto_register_smux(void); +void proto_reg_handoff_smux(void); + static gboolean snmp_usm_auth_md5(snmp_usm_params_t* p, guint8**, guint*, gchar const**); static gboolean snmp_usm_auth_sha1(snmp_usm_params_t* p, guint8**, guint*, gchar const**); @@ -306,7 +311,7 @@ static int hf_snmp_priority = -1; /* INTEGER_M1_2147483647 */ static int hf_snmp_operation = -1; /* T_operation */ /*--- End of included file: packet-snmp-hf.c ---*/ -#line 232 "../../asn1/snmp/packet-snmp-template.c" +#line 237 "../../asn1/snmp/packet-snmp-template.c" static int hf_smux_version = -1; static int hf_smux_pdutype = -1; @@ -349,7 +354,7 @@ static gint ett_snmp_SimpleOpen_U = -1; static gint ett_snmp_RReqPDU_U = -1; /*--- End of included file: packet-snmp-ett.c ---*/ -#line 251 "../../asn1/snmp/packet-snmp-template.c" +#line 256 "../../asn1/snmp/packet-snmp-template.c" static const true_false_string auth_flags = { "OK", @@ -803,7 +808,7 @@ show_oid_index: proto_tree_add_ether(pt_name,k->hfid,tvb,name_offset,buf_len, buf); break; case OID_KEY_TYPE_IPADDR: { - guint32* ipv4_p = (void*)buf; + guint32* ipv4_p = (guint32*)buf; proto_tree_add_ipv4(pt_name,k->hfid,tvb,name_offset,buf_len, *ipv4_p); } break; @@ -1583,7 +1588,7 @@ snmp_usm_priv_des(snmp_usm_params_t* p _U_, tvbuff_t* encryptedData _U_, gchar c return clear_tvb; on_gcry_error: - *error = (void*)gpg_strerror(err); + *error = (const gchar *)gpg_strerror(err); if (hd) gcry_cipher_close(hd); return NULL; #else @@ -1653,7 +1658,7 @@ snmp_usm_priv_aes_common(snmp_usm_params_t* p, tvbuff_t* encryptedData, gchar co return clear_tvb; on_gcry_error: - *error = (void*)gpg_strerror(err); + *error = (const gchar *)gpg_strerror(err); if (hd) gcry_cipher_close(hd); return NULL; } @@ -1692,7 +1697,7 @@ snmp_usm_priv_aes256(snmp_usm_params_t* p _U_, tvbuff_t* encryptedData _U_, gcha #endif } -gboolean +static gboolean check_ScopedPdu(tvbuff_t* tvb) { int offset; @@ -2851,7 +2856,7 @@ static void dissect_SMUX_PDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-snmp-fn.c ---*/ -#line 1631 "../../asn1/snmp/packet-snmp-template.c" +#line 1636 "../../asn1/snmp/packet-snmp-template.c" guint @@ -3766,7 +3771,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2281 "../../asn1/snmp/packet-snmp-template.c" +#line 2286 "../../asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3806,7 +3811,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2297 "../../asn1/snmp/packet-snmp-template.c" +#line 2302 "../../asn1/snmp/packet-snmp-template.c" }; module_t *snmp_module; diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 31dc7bb3aa..7a04e43fd9 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -45,6 +45,9 @@ #include <epan/conversation.h> #include <epan/tap.h> +void proto_register_udp(void); +void proto_reg_handoff_udp(void); + static int udp_tap = -1; static int udp_follow_tap = -1; @@ -452,9 +455,9 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) if (((ip_proto == IP_PROTO_UDP) && (udp_check_checksum)) || ((ip_proto == IP_PROTO_UDPLITE) && (udplite_check_checksum))) { /* Set up the fields of the pseudo-header. */ - cksum_vec[0].ptr = (guint8 *)pinfo->src.data; + cksum_vec[0].ptr = (const guint8 *)pinfo->src.data; cksum_vec[0].len = pinfo->src.len; - cksum_vec[1].ptr = (guint8 *)pinfo->dst.data; + cksum_vec[1].ptr = (const guint8 *)pinfo->dst.data; cksum_vec[1].len = pinfo->dst.len; cksum_vec[2].ptr = (const guint8 *)&phdr; switch (pinfo->src.type) { |