From 3f569932d87b0de1c309ac4ab00aa118ea34e318 Mon Sep 17 00:00:00 2001 From: AndersBroman Date: Thu, 24 Apr 2014 10:53:29 +0200 Subject: Fix warning: declaration of 'address' shadows a global declaration. Change-Id: I0be594aca0e8fac3c55492f6c168b0b8c13e63e5 Reviewed-on: https://code.wireshark.org/review/1324 Reviewed-by: Anders Broman --- epan/dissectors/packet-lisp.c | 8 ++++---- 1 file 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: -- cgit v1.2.3