diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 15:17:27 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 22:17:56 +0000 |
| commit | 0a9a2554a46ce4e040dba669a3ed22f0e9ab709e (patch) | |
| tree | 931067907b96dc2f2ad7bf815f28aad90f6a0f6b /epan/dissectors/packet-scsi-osd.c | |
| parent | d4f6480253cf303f70c3d831098adf7582403b8f (diff) | |
Remove more deprecated tvb_length calls
Change-Id: Ie137e6f4e20fe26b1a4d9510e267896219c1c631
Reviewed-on: https://code.wireshark.org/review/9075
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-scsi-osd.c')
| -rw-r--r-- | epan/dissectors/packet-scsi-osd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 4091ce72ba..5b5d54603f 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -509,7 +509,7 @@ dissect_osd_attributes_list(packet_info *pinfo, tvbuff_t *tvb, int offset, * all remaining bytes. 7.1.3.1 */ if (!osd2 && type == 1) { - length = tvb_length_remaining(tvb, offset); + length = tvb_reported_length_remaining(tvb, offset); } length += (osd2?8:4); @@ -1592,7 +1592,7 @@ dissect_osd_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_osd_attribute_data_in(pinfo, tvb, offset, tree, cdata, lun_info); allocation_length = cdata->itlq->alloc_len; - remaining_length = tvb_length_remaining(tvb, offset); + remaining_length = tvb_captured_length_remaining(tvb, offset); if (remaining_length<allocation_length) allocation_length = remaining_length; if (allocation_length<24) return; @@ -3141,7 +3141,7 @@ dissect_osd2_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_osd_attribute_data_in(pinfo, tvb, offset, tree, cdata, lun_info); allocation_length = cdata->itlq->alloc_len; - remaining_length = tvb_length_remaining(tvb, offset); + remaining_length = tvb_captured_length_remaining(tvb, offset); if (remaining_length<allocation_length) allocation_length = remaining_length; if (allocation_length<12) return; |