diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-16 03:35:29 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-16 03:35:29 +0000 |
| commit | 357e335a9d3ca043c9bf08701399cf650fa666a0 (patch) | |
| tree | 9659b266111b939e5e8ec48e927fd36978e40e88 /epan/dissectors/packet-dcm.c | |
| parent | 79d6570a1e16ef93f8050d800e46811876b81a4a (diff) | |
Use tvb_memeql() and tvb_memcpy().
Use tvb_ip_to_str() and tvb_ip6_to_str().
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35546 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dcm.c')
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index d4677520fb..23a49510fe 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -6316,7 +6316,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pdv->data = g_malloc(next_tvb->length); /* will be freed in dcm_export_create_object() */ if (pdv->data) { - memmove(pdv->data, tvb_get_ptr(next_tvb, 0, next_tvb->length), next_tvb->length); + tvb_memcpy(next_tvb, pdv->data, 0, next_tvb->length); pdv->data_len = next_tvb->length; } @@ -6336,7 +6336,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pdv->data = g_malloc(pdv_body_len); /* will be freed in dcm_export_create_object() */ if (pdv->data) { - memmove(pdv->data, tvb_get_ptr(tvb, startpos, pdv_body_len), pdv_body_len); + tvb_memcpy(tvb, pdv->data, startpos, pdv_body_len); pdv->data_len = pdv_body_len; } |