diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-05 15:56:36 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-05 15:56:36 +0000 |
| commit | 7cd0417af555a78b19c6909a40d1867e0fe9a063 (patch) | |
| tree | cc09f739029479eee683f26228e098db307fd1aa /epan/dissectors/packet-reload-framing.c | |
| parent | f8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (diff) | |
| download | wireshark-7cd0417af555a78b19c6909a40d1867e0fe9a063.tar.gz | |
Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).
svn path=/trunk/; revision=46402
Diffstat (limited to 'epan/dissectors/packet-reload-framing.c')
| -rw-r--r-- | epan/dissectors/packet-reload-framing.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index 2ca74a9254..2e659dceeb 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -347,23 +347,23 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr { guint32 received; int last_received = -1; - int index = 0; + int indx = 0; proto_tree *received_tree; proto_item *ti_parsed_received = NULL; received = tvb_get_ntohl(tvb, offset); - while ((received<<index) != 0) { - if (index>=32) break; - if (received &(0x1<<(31-index))) { - if (index==0) { + while ((received<<indx) != 0) { + if (indx>=32) break; + if (received &(0x1<<(31-indx))) { + if (indx==0) { received_tree = proto_item_add_subtree(ti_received, ett_reload_framing_received); ti_parsed_received = proto_tree_add_item(received_tree, hf_reload_framing_parsed_received, tvb, offset, 4, ENC_NA); - proto_item_append_text(ti_parsed_received, "[%u", (sequence -32+index)); - last_received = index; + proto_item_append_text(ti_parsed_received, "[%u", (sequence -32+indx)); + last_received = indx; } else { - if (received &(0x1<<(31-index+1))) { - index++; + if (received &(0x1<<(31-indx+1))) { + indx++; /* range: skip */ continue; } @@ -373,43 +373,43 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* 1st acked ever */ received_tree = proto_item_add_subtree(ti_received, ett_reload_framing_received); ti_parsed_received = proto_tree_add_item(received_tree, hf_reload_framing_parsed_received, tvb, offset, 4, ENC_NA); - proto_item_append_text(ti_parsed_received, "[%u",(sequence-32+index)); + proto_item_append_text(ti_parsed_received, "[%u",(sequence-32+indx)); } else { - proto_item_append_text(ti_parsed_received, ",%u",(sequence-32+index)); + proto_item_append_text(ti_parsed_received, ",%u",(sequence-32+indx)); } - last_received = index; + last_received = indx; } } } - else if (index>0) { - if ((received &(0x1<<(31-index+1))) && (received &(0x1<<(31-index+2)))) { + else if (indx>0) { + if ((received &(0x1<<(31-indx+1))) && (received &(0x1<<(31-indx+2)))) { /* end of a series */ - if ((received &(0x1<<(31-index+3)))) { - proto_item_append_text(ti_parsed_received,"-%u",(sequence-32+index-1)); + if ((received &(0x1<<(31-indx+3)))) { + proto_item_append_text(ti_parsed_received,"-%u",(sequence-32+indx-1)); } else { /* just a pair */ - proto_item_append_text(ti_received, ",%u", (sequence-32+index-1)); + proto_item_append_text(ti_received, ",%u", (sequence-32+indx-1)); } } else { - index++; + indx++; continue; } } - index++; + indx++; } if (last_received>=0) { - if ((received &(0x1<<(31-index+1))) && (received &(0x1<<(31-index+2)))) { + if ((received &(0x1<<(31-indx+1))) && (received &(0x1<<(31-indx+2)))) { /* end of a series */ - if ((received &(0x1<<(31-index+3)))) { - proto_item_append_text(ti_parsed_received,"-%u",(sequence-32+index-1)); + if ((received &(0x1<<(31-indx+3)))) { + proto_item_append_text(ti_parsed_received,"-%u",(sequence-32+indx-1)); } else { /* just a pair */ - proto_item_append_text(ti_parsed_received, ",%u", (sequence-32+index-1)); + proto_item_append_text(ti_parsed_received, ",%u", (sequence-32+indx-1)); } } proto_item_append_text(ti_parsed_received, "]"); |