diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-22 09:59:50 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-22 20:43:34 +0000 |
| commit | be6fb606915f4ccc68a62195619d176cd62f79f9 (patch) | |
| tree | edd4b63c557923d1196dd779ac91ee1e1bae90ef /epan/dissectors/packet-sccp.c | |
| parent | 45872b9f7bf10476e48187f4b699c6f44943f22a (diff) | |
| download | wireshark-be6fb606915f4ccc68a62195619d176cd62f79f9.tar.gz | |
Remove a bunch of deprecated tvb_length calls
Change-Id: I9362e0fdc4519ba5f3d656152966e7030f478839
Reviewed-on: https://code.wireshark.org/review/9022
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-sccp.c')
| -rw-r--r-- | epan/dissectors/packet-sccp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 5a32253a23..fe320c9405 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -827,7 +827,7 @@ sccp_called_calling_looks_valid(guint32 frame_num _U_, tvbuff_t *tvb, guint8 my_ { guint8 ai, ri, gti, ssni, pci; guint8 len_needed = 1; /* need at least the Address Indicator */ - guint len = tvb_length(tvb); + guint len = tvb_reported_length(tvb); ai = tvb_get_guint8(tvb, 0); if ((my_mtp3_standard == ANSI_STANDARD) && ((ai & ANSI_NATIONAL_MASK) == 0)) @@ -893,7 +893,7 @@ looks_like_valid_sccp(guint32 frame_num _U_, tvbuff_t *tvb, guint8 my_mtp3_stand guint data_ptr = 0; guint opt_ptr = 0; guint8 pointer_length = POINTER_LENGTH; - guint len = tvb_length(tvb); + guint len = tvb_captured_length(tvb); /* Ensure we can do some basic checks without throwing an exception. * Accesses beyond this length need to check the length first because @@ -1549,7 +1549,7 @@ dissect_sccp_unknown_message(tvbuff_t *message_tvb, proto_tree *sccp_tree) { guint32 message_length; - message_length = tvb_length(message_tvb); + message_length = tvb_captured_length(message_tvb); proto_tree_add_bytes_format(sccp_tree, hf_sccp_unknown_message, message_tvb, 0, message_length, NULL, "Unknown message (%u byte%s)", |