(Minor) Fix a gcc -Wshadow warning.

svn path=/trunk/; revision=32233
This commit is contained in:
Bill Meier 2010-03-18 20:19:07 +00:00
parent 2f07f816b2
commit 8024cbd206
1 changed files with 5 additions and 4 deletions

View File

@ -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,