diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-19 23:51:27 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-19 23:51:27 +0000 |
| commit | 37547c1791d7e975a295a921bfa06b8a663f33c5 (patch) | |
| tree | c80e492308a8253f1028a08c173491c431be809b /epan/dissectors/packet-sdlc.c | |
| parent | fadae76f0c41a69eecfb97236c604fcdc18afeca (diff) | |
| download | wireshark-37547c1791d7e975a295a921bfa06b8a663f33c5.tar.gz wireshark-37547c1791d7e975a295a921bfa06b8a663f33c5.tar.bz2 wireshark-37547c1791d7e975a295a921bfa06b8a663f33c5.zip | |
Fix a few gcc _Wshadow warnings ....
svn path=/trunk/; revision=31580
Diffstat (limited to 'epan/dissectors/packet-sdlc.c')
| -rw-r--r-- | epan/dissectors/packet-sdlc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index 886dec36ab..a7f60ec874 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -74,7 +74,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *sdlc_tree; proto_item *sdlc_ti; - guint8 address; + guint8 addr; guint16 control; int sdlc_header_len; gboolean is_response; @@ -83,7 +83,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDLC"); col_clear(pinfo->cinfo, COL_INFO); - address = tvb_get_guint8(tvb, 0); + addr = tvb_get_guint8(tvb, 0); sdlc_header_len = 1; /* address */ /* @@ -109,7 +109,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sdlc_tree = proto_item_add_subtree(sdlc_ti, ett_sdlc); proto_tree_add_uint(sdlc_tree, hf_sdlc_address, tvb, 0, 1, - address); + addr); } else { sdlc_ti = NULL; sdlc_tree = NULL; |