(Minor) Fix a gcc -Wshadow warning.
svn path=/trunk/; revision=32233
This commit is contained in:
parent
2f07f816b2
commit
8024cbd206
|
@ -823,10 +823,6 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
|
||||||
guint8 s_len;
|
guint8 s_len;
|
||||||
int ava_vid;
|
int ava_vid;
|
||||||
const guchar *dns_name;
|
const guchar *dns_name;
|
||||||
guint16 duidtype;
|
|
||||||
guint16 hwtype;
|
|
||||||
guint8 *buf;
|
|
||||||
int enterprise;
|
|
||||||
|
|
||||||
|
|
||||||
static const value_string slpda_vals[] = {
|
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
|
identifier' option, the type of the 'client identifier' option is set
|
||||||
to 255. */
|
to 255. */
|
||||||
} else if (byte == 255) {
|
} else if (byte == 255) {
|
||||||
|
guint16 duidtype;
|
||||||
|
guint16 hwtype;
|
||||||
|
guint8 *buf;
|
||||||
|
int enterprise;
|
||||||
|
|
||||||
/* The type field is immediately followed by the IAID, which is
|
/* The type field is immediately followed by the IAID, which is
|
||||||
an opaque 32-bit quantity */
|
an opaque 32-bit quantity */
|
||||||
proto_tree_add_text(v_tree, tvb, optoff+1, 4,
|
proto_tree_add_text(v_tree, tvb, optoff+1, 4,
|
||||||
|
|
Loading…
Reference in New Issue