aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ncp-sss.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-19 00:37:39 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-19 00:37:39 +0000
commit330bcd5d139042e152235c76958d42a06217ee08 (patch)
tree7a28d0a4649f007b3dee96d0d9955ce9cd73410d /epan/dissectors/packet-ncp-sss.c
parent52f971e820f12141ee5df98d890d0cfa9ddd5977 (diff)
Fix gcc -Wshadow warnings
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31561 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ncp-sss.c')
-rw-r--r--epan/dissectors/packet-ncp-sss.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index 6d9249f498..68438bb69d 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -35,7 +35,7 @@
#include "packet-ncp-int.h"
#include "packet-ncp-sss.h"
-static guint32 subverb=0;
+static guint32 gbl_subverb=0;
static gint ett_sss = -1;
@@ -601,21 +601,21 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp
proto_tree_add_item(ncp_tree, hf_length, tvb, foffset, 4, TRUE);
foffset += 4;
foffset += 12; /* Blank Context */
- subverb = tvb_get_letohl(tvb, foffset);
+ gbl_subverb = tvb_get_letohl(tvb, foffset);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(subverb, sss_verb_enum, "Unknown (%d)"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(gbl_subverb, sss_verb_enum, "Unknown (%d)"));
}
aitem = proto_tree_add_item(ncp_tree, hf_verb, tvb, foffset, 4, TRUE);
atree = proto_item_add_subtree(aitem, ett_sss);
if (request_value) {
- request_value->req_nds_flags=subverb;
+ request_value->req_nds_flags=gbl_subverb;
}
foffset += 4;
process_flags(atree, tvb, foffset);
foffset += 4;
proto_tree_add_item(atree, hf_context, tvb, foffset, 4, FALSE);
foffset += 4;
- switch (subverb) {
+ switch (gbl_subverb) {
case 0:
foffset += 4;
foffset = sss_string(tvb, hf_user, atree, foffset, TRUE, 0);