From 7cd0417af555a78b19c6909a40d1867e0fe9a063 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Wed, 5 Dec 2012 15:56:36 +0000 Subject: 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 --- epan/dissectors/packet-ieee80211-prism.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-ieee80211-prism.c') diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index f7cbf137f3..9cb1a5fccc 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -269,7 +269,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset; guint32 msgcode, msglen, did; guint16 status; - guint8 *devname; + guint8 *devname_p; offset = 0; did = 0; @@ -324,10 +324,10 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) { proto_tree_add_item(prism_tree, hf_ieee80211_prism_devname, tvb, offset, 16, ENC_ASCII|ENC_NA); } - devname = tvb_get_ephemeral_string(tvb, offset, 16); + devname_p = tvb_get_ephemeral_string(tvb, offset, 16); offset += 16; - col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %s, Message 0x%x, Length %d", devname, msgcode, msglen); + col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %s, Message 0x%x, Length %d", devname_p, msgcode, msglen); while(offset < PRISM_HEADER_LENGTH) -- cgit v1.2.3