diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-22 13:56:19 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-22 13:56:19 +0000 |
| commit | 1a4283ccf885f5a519c294d77f04e615ca209ee9 (patch) | |
| tree | 05bac2c93b046f4c68a65c859d58bf7c474eb056 /epan/dissectors/packet-rsvp.c | |
| parent | a33e4ee41ef1f5408cf76b5cec564244aae15820 (diff) | |
Fixes for gcc -Wshadow warnings; Fix indentation and do other minor cleanup in a few cases.
svn path=/trunk/; revision=31617
Diffstat (limited to 'epan/dissectors/packet-rsvp.c')
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 03fa4d9e0d..9b457ee7ce 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -5344,14 +5344,14 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (message_type == RSVP_MSG_BUNDLE) { /* Bundle message. Dissect component messages */ if (rsvp_bundle_dissect) { - int len = 8; - while (len < msg_length) { + int len2 = 8; + while (len2 < msg_length) { gint sub_len; tvbuff_t *tvb_sub; - sub_len = tvb_get_ntohs(tvb, len+6); - tvb_sub = tvb_new_subset(tvb, len, sub_len, sub_len); + sub_len = tvb_get_ntohs(tvb, len2+6); + tvb_sub = tvb_new_subset(tvb, len2, sub_len, sub_len); dissect_rsvp_msg_tree(tvb_sub, pinfo, rsvp_tree, TREE(TT_BUNDLE_COMPMSG), rsvph); - len += sub_len; + len2 += sub_len; } } else { proto_tree_add_text(rsvp_tree, tvb, offset, msg_length - len, |