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-dcerpc-spoolss.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
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-dcerpc-spoolss.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-spoolss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 585d5d26e7..8cd5419057 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -1077,7 +1077,7 @@ dissect_spoolss_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* Get remaining data in buffer as a string */ - remaining = tvb_captured_length_remaining(tvb, offset); + remaining = tvb_length_remaining(tvb, offset); if (remaining <= 0) { if (data) *data = g_strdup(""); @@ -4142,7 +4142,7 @@ dissect_FORM_1(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Eek - we need to know whether this pointer was NULL or not. Currently there is not any way to do this. */ - if (tvb_captured_length_remaining(tvb, offset) <= 0) + if (tvb_length_remaining(tvb, offset) <= 0) goto done; offset = dissect_ndr_uint32( @@ -4485,7 +4485,7 @@ static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep _U_) { - int len = tvb_captured_length(tvb); + int len = tvb_length(tvb); proto_tree_add_text(tree, tvb, offset, 0, "[Unimplemented dissector: SPOOLSS]"); |