aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dccp.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-03-16 08:52:09 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-03-16 08:52:09 +0000
commit5a85b7fed2eb804db57cde3c851a12088cc60ee7 (patch)
tree80e3d37b1fe7dc5176b11794585f29346fbc0477 /epan/dissectors/packet-dccp.c
parent27744ecc2d9925491e5ef8cc97e41d551efc6a2e (diff)
[-Wmissing-prototypes]
Use explicit casts. svn path=/trunk/; revision=48338
Diffstat (limited to 'epan/dissectors/packet-dccp.c')
-rw-r--r--epan/dissectors/packet-dccp.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index 2c09ec7355..40e56e7d8c 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -79,6 +79,9 @@
#define DCCP_HDR_LEN_MAX (DCCP_HDR_LEN + DCCP_HDR_PKT_TYPES_LEN_MAX + \
DCCP_OPT_LEN_MAX)
+void proto_register_dccp(void);
+void proto_reg_handoff_dccp(void);
+
/*
* FF: please keep this list in sync with
* http://www.iana.org/assignments/dccp-parameters/dccp-parameters.xml
@@ -629,7 +632,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
guint options_len = 0;
e_dccphdr *dccph;
- dccph = ep_alloc0(sizeof (e_dccphdr));
+ dccph = ep_new0(e_dccphdr);
SET_ADDRESS(&dccph->ip_src, pinfo->src.type, pinfo->src.len,
pinfo->src.data);
@@ -718,9 +721,9 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
* reassembly? */
if (dccp_check_checksum) {
/* Set up the fields of the pseudo-header. */
- cksum_vec[0].ptr = pinfo->src.data;
+ cksum_vec[0].ptr = (const guint8 *)pinfo->src.data;
cksum_vec[0].len = pinfo->src.len;
- cksum_vec[1].ptr = 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) {