From 8024cbd20699ef569f6f40c43acf15a74ce8a59f Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Thu, 18 Mar 2010 20:19:07 +0000 Subject: [PATCH] (Minor) Fix a gcc -Wshadow warning. svn path=/trunk/; revision=32233 --- epan/dissectors/packet-bootp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 8af79bb875..9dafef9453 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -823,10 +823,6 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, guint8 s_len; int ava_vid; const guchar *dns_name; - guint16 duidtype; - guint16 hwtype; - guint8 *buf; - int enterprise; static const value_string slpda_vals[] = { @@ -1259,6 +1255,11 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, identifier' option, the type of the 'client identifier' option is set to 255. */ } else if (byte == 255) { + guint16 duidtype; + guint16 hwtype; + guint8 *buf; + int enterprise; + /* The type field is immediately followed by the IAID, which is an opaque 32-bit quantity */ proto_tree_add_text(v_tree, tvb, optoff+1, 4,