diff options
author | Bill Meier <wmeier@newsguy.com> | 2010-01-28 15:03:47 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2010-01-28 15:03:47 +0000 |
commit | b3b101e606a6abe8dabd393848cb1f6c0fbd4c56 (patch) | |
tree | e2be7c2f8307e71c1de61998010ec69235afa1a0 | |
parent | 3a9c03abd6b2544e857f4ba427f25d32109ecfab (diff) | |
download | wireshark-b3b101e606a6abe8dabd393848cb1f6c0fbd4c56.tar.gz |
Fix gcc -Wshadow warning.
svn path=/trunk/; revision=31715
-rw-r--r-- | asn1/spnego/spnego.cnf | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-spnego.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index 91a10186c4..f5ce61ff75 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -46,7 +46,7 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC #.FN_BODY InnerContextToken - gssapi_oid_value *next_level_value; + gssapi_oid_value *next_level_value_lcl; proto_item *item; proto_tree *subtree; tvbuff_t *token_tvb; @@ -60,7 +60,7 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC * for some other security mechanism in GSS_Wrap tokens.) * Does it matter? */ - next_level_value = gssapi_lookup_oid_str(MechType_oid); + next_level_value_lcl = gssapi_lookup_oid_str(MechType_oid); /* * Now dissect the GSS_Wrap token; it's assumed to be in the @@ -77,8 +77,8 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC * we (and it) dissected. */ token_tvb = tvb_new_subset_remaining(tvb, offset); - if (next_level_value && next_level_value->wrap_handle) { - len = call_dissector(next_level_value->wrap_handle, token_tvb, actx->pinfo, + if (next_level_value_lcl && next_level_value_lcl->wrap_handle) { + len = call_dissector(next_level_value_lcl->wrap_handle, token_tvb, actx->pinfo, subtree); if (len == 0) offset = tvb_length(tvb); diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index f1a3a9738c..8a997c140b 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -530,7 +530,7 @@ static int dissect_spnego_InnerContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 48 "spnego.cnf" - gssapi_oid_value *next_level_value; + gssapi_oid_value *next_level_value_lcl; proto_item *item; proto_tree *subtree; tvbuff_t *token_tvb; @@ -544,7 +544,7 @@ dissect_spnego_InnerContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i * for some other security mechanism in GSS_Wrap tokens.) * Does it matter? */ - next_level_value = gssapi_lookup_oid_str(MechType_oid); + next_level_value_lcl = gssapi_lookup_oid_str(MechType_oid); /* * Now dissect the GSS_Wrap token; it's assumed to be in the @@ -561,8 +561,8 @@ dissect_spnego_InnerContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i * we (and it) dissected. */ token_tvb = tvb_new_subset_remaining(tvb, offset); - if (next_level_value && next_level_value->wrap_handle) { - len = call_dissector(next_level_value->wrap_handle, token_tvb, actx->pinfo, + if (next_level_value_lcl && next_level_value_lcl->wrap_handle) { + len = call_dissector(next_level_value_lcl->wrap_handle, token_tvb, actx->pinfo, subtree); if (len == 0) offset = tvb_length(tvb); |