diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-03-18 20:19:07 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-03-18 20:19:07 +0000 |
| commit | 8024cbd20699ef569f6f40c43acf15a74ce8a59f (patch) | |
| tree | 000fc0e29da2a616d171ddca4aa6cadc5758cc2c | |
| parent | 2f07f816b2f4b5d84f3ccc82723facbd3124eb8f (diff) | |
(Minor) Fix a gcc -Wshadow warning.
svn path=/trunk/; revision=32233
| -rw-r--r-- | epan/dissectors/packet-bootp.c | 9 |
1 files 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, |