aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2014-04-24 10:53:29 +0200
committerAnders Broman <a.broman58@gmail.com>2014-04-24 08:54:47 +0000
commit3f569932d87b0de1c309ac4ab00aa118ea34e318 (patch)
tree09237c835df132c7214ba3bb08bed068cdca5a78 /epan/dissectors
parentf37116aa92c936796e166a03d775a9c5c3d7c0b9 (diff)
Fix warning: declaration of 'address' shadows a global declaration.
Change-Id: I0be594aca0e8fac3c55492f6c168b0b8c13e63e5 Reviewed-on: https://code.wireshark.org/review/1324 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-lisp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c
index aafc6b63ee..4b8465ee5b 100644
--- a/epan/dissectors/packet-lisp.c
+++ b/epan/dissectors/packet-lisp.c
@@ -623,7 +623,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
guint8 min, sec;
guint32 alt;
guint16 afi;
- const gchar *address;
+ const gchar *ip_address;
const guint16 mask = 0x7FFF; /* prepare mask for N or E bit */
proto_item *ti_lat, *ti_lon, *ti_alt;
proto_tree *lat_tree, *lon_tree;
@@ -722,9 +722,9 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
proto_tree_add_item(tree, hf_lisp_lcaf_geo_afi, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- address = get_addr_str(tvb, offset, afi, &addr_len);
- if (address && afi)
- proto_item_append_text(tir, ", Address: %s", address);
+ ip_address = get_addr_str(tvb, offset, afi, &addr_len);
+ if (ip_address && afi)
+ proto_item_append_text(tir, ", Address: %s", ip_address);
switch (afi) {
case AFNUM_RESERVED: