osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

packet-thread.c: rename remainder -> remaining 

Pacify macOS buildbot

Change-Id: I60bdb0ca7b9a1456d6fe12879dec61c5dff19e53
Reviewed-on: https://code.wireshark.org/review/21039
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2017-04-12 07:34:31 -04:00
parent ccdb9073cd
commit c587edb41b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-thread.c
View File

@ -1975,14 +1975,14 @@ dissect_thread_nwd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
if (tlv_offset < tlv_len) {
proto_tree *sub_tlv_tree;
guint remainder = tlv_len - tlv_offset;
guint remaining = tlv_len - tlv_offset;
ti = proto_tree_add_item(tlv_tree, hf_thread_nwd_tlv_sub_tlvs, tvb, offset, 1, ENC_NA);
sub_tlv_tree = proto_item_add_subtree(ti, ett_thread_nwd_prefix_sub_tlvs);
/* Call this dissector for sub-TLVs */
sub_tvb = tvb_new_subset_length(tvb, offset, remainder); /* remove prefix length (1) and prefix (prefix_byte_len) */
sub_tvb = tvb_new_subset_length(tvb, offset, remaining); /* remove prefix length (1) and prefix (prefix_byte_len) */
dissect_thread_nwd(sub_tvb, pinfo, sub_tlv_tree, data);
offset += remainder;
offset += remaining;
}
}
break;
@ -2084,14 +2084,14 @@ dissect_thread_nwd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
/* Server sub-TLVs */
if (tlv_offset < tlv_len) {
proto_tree *sub_tlv_tree;
guint remainder = tlv_len - tlv_offset;
guint remaining = tlv_len - tlv_offset;
ti = proto_tree_add_item(tlv_tree, hf_thread_nwd_tlv_sub_tlvs, tvb, offset, 1, ENC_NA);
sub_tlv_tree = proto_item_add_subtree(ti, ett_thread_nwd_prefix_sub_tlvs);
/* Call this dissector for sub-TLVs. Should only be server TLVs */
sub_tvb = tvb_new_subset_length(tvb, offset, remainder); /* remove prefix length (1) and prefix (prefix_byte_len) */
sub_tvb = tvb_new_subset_length(tvb, offset, remaining); /* remove prefix length (1) and prefix (prefix_byte_len) */
dissect_thread_nwd(sub_tvb, pinfo, sub_tlv_tree, data);
offset += remainder;
offset += remaining;
}
}
break;