diff options
| author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-03-26 11:06:26 +0000 |
|---|---|---|
| committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-03-26 11:06:26 +0000 |
| commit | 840aa333724fb9ba8b2985b11471266943bf160c (patch) | |
| tree | b8f2ffabbc79998f21731cceca8a4fca4031281e /epan/dissectors/packet-bthci_acl.c | |
| parent | 83002363fe48274e7f1626a1e083280d965a8458 (diff) | |
From Sebastien Tandel
fixes for various compiler warnings
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21210 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-bthci_acl.c')
| -rw-r--r-- | epan/dissectors/packet-bthci_acl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 221ef8fa53..348bf130e9 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -170,7 +170,7 @@ dissect_btacl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mfp->last_frame=0; mfp->tot_len=l2cap_length+4; mfp->reassembled=se_alloc(l2cap_length+4); - tvb_memcpy(tvb, mfp->reassembled, offset, tvb_length_remaining(tvb, offset)); + tvb_memcpy(tvb, (guint8*)mfp->reassembled, offset, tvb_length_remaining(tvb, offset)); mfp->cur_off=tvb_length_remaining(tvb, offset); se_tree_insert32(chandle_data->start_fragments, pinfo->fd->num, mfp); } else { @@ -189,7 +189,7 @@ dissect_btacl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mfp=se_tree_lookup32_le(chandle_data->start_fragments, pinfo->fd->num); if(!pinfo->fd->flags.visited){ if(mfp && !mfp->last_frame && (mfp->tot_len>=mfp->cur_off+tvb_length_remaining(tvb, offset))){ - tvb_memcpy(tvb, mfp->reassembled+mfp->cur_off, offset, tvb_length_remaining(tvb, offset)); + tvb_memcpy(tvb, (guint8*)mfp->reassembled+mfp->cur_off, offset, tvb_length_remaining(tvb, offset)); mfp->cur_off+=tvb_length_remaining(tvb, offset); if(mfp->cur_off==mfp->tot_len){ mfp->last_frame=pinfo->fd->num; @@ -205,7 +205,7 @@ dissect_btacl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } if(mfp && mfp->last_frame==pinfo->fd->num){ - next_tvb = tvb_new_real_data(mfp->reassembled, mfp->tot_len, mfp->tot_len); + next_tvb = tvb_new_real_data((guint8*)mfp->reassembled, mfp->tot_len, mfp->tot_len); tvb_set_child_real_data_tvbuff(tvb, next_tvb); add_new_data_source(pinfo, next_tvb, "Reassembled BTHCI ACL"); |