diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-dcm.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
| download | wireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.tar.gz | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dcm.c')
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 5d88f26d29..363c5ab4e3 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -6713,7 +6713,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += pdv_body_len; } else { - guint next_tvb_captured_length = tvb_captured_length(next_tvb); + guint next_tvb_length = tvb_length(next_tvb); /* Decode reassembled data */ if (tree || have_tap_listener(dicom_eo_tap)) { @@ -6723,15 +6723,15 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i.e Class & Instance UID, so the export dialog has all information and that the dicom header is complete */ - offset += dissect_dcm_pdv_body(next_tvb, pinfo, tree, pdv, 0, next_tvb_captured_length, pdv_description); + offset += dissect_dcm_pdv_body(next_tvb, pinfo, tree, pdv, 0, next_tvb_length, pdv_description); } if (have_tap_listener(dicom_eo_tap)) { /* Copy pure DICOM data to buffer, no PDV flags */ - pdv->data = g_malloc(next_tvb_captured_length); /* will be freed in dcm_export_create_object() */ - tvb_memcpy(next_tvb, pdv->data, 0, next_tvb_captured_length); - pdv->data_len = next_tvb_captured_length; + pdv->data = g_malloc(next_tvb_length); /* will be freed in dcm_export_create_object() */ + tvb_memcpy(next_tvb, pdv->data, 0, next_tvb_length); + pdv->data_len = next_tvb_length; /* Copy to export buffer */ dcm_export_create_object(pinfo, assoc, pdv); |