aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nsip.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-19 00:37:39 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-19 00:37:39 +0000
commit330bcd5d139042e152235c76958d42a06217ee08 (patch)
tree7a28d0a4649f007b3dee96d0d9955ce9cd73410d /epan/dissectors/packet-nsip.c
parent52f971e820f12141ee5df98d890d0cfa9ddd5977 (diff)
Fix gcc -Wshadow warnings
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31561 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-nsip.c')
-rw-r--r--epan/dissectors/packet-nsip.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 8b9f2b8291..51210205af 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -518,14 +518,14 @@ decode_iei_reset_flag(nsip_ie_t *ie, build_info_t *bi, int ie_start_offset) {
static void
decode_iei_ip_address(nsip_ie_t *ie, build_info_t *bi, int ie_start_offset) {
- guint8 address_type;
+ guint8 addr_type;
guint32 ip4_addr;
struct e_in6_addr ip6_addr;
- address_type = tvb_get_guint8(bi->tvb, bi->offset);
+ addr_type = tvb_get_guint8(bi->tvb, bi->offset);
proto_tree_add_item(bi->nsip_tree, hf_nsip_ip_address_type,
bi->tvb, bi->offset, 1, FALSE);
- switch (address_type) {
+ switch (addr_type) {
case NSIP_IP_ADDRESS_TYPE_IPV4:
ie->total_length = 2 + ipv4_element.address_length;
ip4_addr = tvb_get_ipv4(bi->tvb, bi->offset+1);