diff options
| author | Evan Huus <eapache@gmail.com> | 2015-04-04 13:41:30 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-04-05 12:27:34 +0000 |
| commit | 32d0fc067367646b86c09a7e644ed5fc5817d246 (patch) | |
| tree | e7ac0dc1db6fb0778d93cc3615dbf626e677e50d /plugins/irda/packet-irda.c | |
| parent | 8699bc285819244aca8c580e8aebd7780148fedd (diff) | |
| download | wireshark-32d0fc067367646b86c09a7e644ed5fc5817d246.tar.gz | |
irda: remove tvb_length calls
Change-Id: I5ea9ed7226217ab272d957ae3240a286c6a26de9
Reviewed-on: https://code.wireshark.org/review/7912
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'plugins/irda/packet-irda.c')
| -rw-r--r-- | plugins/irda/packet-irda.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 63a6326bfa..f01af6271f 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -459,7 +459,7 @@ static guint dissect_ttp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, gb guint8 head; char buf[128]; - if (tvb_length(tvb) == 0) + if (tvb_reported_length(tvb) == 0) return 0; /* Make entries in Protocol column on summary display */ @@ -513,7 +513,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r iap_conversation_t* iap_conv; char buf[128]; - if (tvb_length(tvb) == 0) + if (tvb_reported_length(tvb) == 0) return; /* Make entries in Protocol column on summary display */ @@ -655,7 +655,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, guint8 circuit_id) { guint offset = 0; - guint len = tvb_length(tvb); + guint len = tvb_reported_length(tvb); guint n = 0; guint list_len; guint8 op; @@ -672,7 +672,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro guint32 num; - if (tvb_length(tvb) == 0) + if (len == 0) return; /* Make entries in Protocol column on summary display */ @@ -1064,7 +1064,7 @@ static void dissect_irlmp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, g } else col_add_fstr(pinfo->cinfo, COL_INFO, "%d > %d, Len=%d", slsap, dlsap, - tvb_length(tvb) - 2); + tvb_reported_length(tvb) - 2); if (root) { @@ -1097,7 +1097,7 @@ static void dissect_irlmp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, g { case CONNECT_CMD: case CONNECT_CNF: - if (offset < tvb_length(tvb)) + if (offset < tvb_reported_length(tvb)) { proto_tree_add_item(tree, hf_lmp_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -1141,7 +1141,7 @@ static void dissect_irlmp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, g { case CONNECT_CMD: case CONNECT_CNF: - if (offset < tvb_length(tvb)) + if (offset < tvb_reported_length(tvb)) offset++; break; |