diff options
author | Bill Meier <wmeier@newsguy.com> | 2008-06-27 04:52:56 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2008-06-27 04:52:56 +0000 |
commit | 7aaadd9bec325d844f4cdc35b2e99cf3795ae63a (patch) | |
tree | 5ce6be4daaab590c80065c2a1f8ae46af0b02b50 /epan/dissectors/packet-chdlc.c | |
parent | 6012eaeafbdefe116e3d3483b907ed6528a6d5df (diff) |
Fix some warnings reported by gcc -Wshadow ...
svn path=/trunk/; revision=25616
Diffstat (limited to 'epan/dissectors/packet-chdlc.c')
-rw-r--r-- | epan/dissectors/packet-chdlc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index 635bbe3531..13b2c858cc 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -277,7 +277,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; proto_tree *slarp_tree = NULL; guint32 code; - guint32 address; + guint32 addr; guint32 mysequence; guint32 yoursequence; @@ -298,10 +298,10 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SLARP_REQUEST: case SLARP_REPLY: if (check_col(pinfo->cinfo, COL_INFO)) { - address = tvb_get_ipv4(tvb, 4); + addr = tvb_get_ipv4(tvb, 4); col_add_fstr(pinfo->cinfo, COL_INFO, "%s, from %s, mask %s", val_to_str(code, slarp_ptype_vals, "Unknown (%d)"), - get_hostname(address), + get_hostname(addr), ip_to_str(tvb_get_ptr(tvb, 8, 4))); } if (tree) { |