summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-04-12 07:34:31 -0400
committerMichael Mann <mmann78@netscape.net>2017-04-12 13:11:48 +0000
commitc587edb41b189350802731a55df9faafb7c63d24 (patch)
treea172bd86e7492ea2fdd52e73e808e48679ccfef5 /epan
parentccdb9073cdf1eee198e383ac202cb370bb0af6ce (diff)
downloadwireshark-c587edb41b189350802731a55df9faafb7c63d24.tar.gz
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>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-thread.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c
index 86e7845674..408b9f6312 100644
--- a/epan/dissectors/packet-thread.c
+++ b/epan/dissectors/packet-thread.c
@@ -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;