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-ieee80211-prism.c | |
| parent | f8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (diff) | |
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-ieee80211-prism.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-prism.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |