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-homeplug.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-homeplug.c')
| -rw-r--r-- | epan/dissectors/packet-homeplug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index ff992da2fd..4eb8f788c9 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -1293,7 +1293,7 @@ static void dissect_homeplug_mme(ptvcursor_t * cursor, packet_info * pinfo) #define TVB_LEN_GREATEST 1 #define TVB_LEN_UNDEF 0 #define TVB_LEN_SHORTEST -1 -static int check_tvb_captured_length(ptvcursor_t *cursor, const gint length) +static int check_tvb_length(ptvcursor_t *cursor, const gint length) { if (!cursor) return TVB_LEN_UNDEF; @@ -1326,7 +1326,7 @@ dissect_homeplug(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) cursor = ptvcursor_new(homeplug_tree, tvb, 0); /* We do not have enough data to read mctrl field stop the dissection */ - if (check_tvb_captured_length(cursor, HOMEPLUG_MCTRL_LEN) != TVB_LEN_SHORTEST) { + if (check_tvb_length(cursor, HOMEPLUG_MCTRL_LEN) != TVB_LEN_SHORTEST) { dissect_homeplug_mctrl(cursor); @@ -1339,12 +1339,12 @@ dissect_homeplug(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) for (; homeplug_ne > 0; homeplug_ne--) { /* Check we have enough data in tvb to read MEHDR */ - if (check_tvb_captured_length(cursor, HOMEPLUG_MEHDR_LEN) == TVB_LEN_SHORTEST) + if (check_tvb_length(cursor, HOMEPLUG_MEHDR_LEN) == TVB_LEN_SHORTEST) break; dissect_homeplug_mehdr(cursor); /* Check we have enough data in tvb to read MELEN */ - if (check_tvb_captured_length(cursor, HOMEPLUG_MELEN_LEN) == TVB_LEN_SHORTEST) + if (check_tvb_length(cursor, HOMEPLUG_MELEN_LEN) == TVB_LEN_SHORTEST) break; dissect_homeplug_melen(cursor); |