aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-user_encap.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2008-06-26 00:16:58 +0000
committerBill Meier <wmeier@newsguy.com>2008-06-26 00:16:58 +0000
commitceebccced4f27f63ac441a18da5937bb48177f41 (patch)
tree7d1f7f36fe44f2900f58d229445ea0102a23d0e3 /epan/dissectors/packet-user_encap.c
parente7831309611d38c0eda2a3edf8ef3d7e2647bdeb (diff)
Fix some warnings reported by gcc -Wshadow ...
svn path=/trunk/; revision=25607
Diffstat (limited to 'epan/dissectors/packet-user_encap.c')
-rw-r--r--epan/dissectors/packet-user_encap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 341584ad8b..9e32f94fda 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -97,15 +97,15 @@ static void dissect_user(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) {
if (!encap) {
char* msg = ep_strdup_printf("user encap not hanlded: DLT=%d, check you Preferences->Protocols->DLT_USER",
pinfo->match_port + 147 - WTAP_ENCAP_USER0);
- proto_item* i = proto_tree_add_text(tree, tvb, 0, 0, msg);
+ proto_item* item = proto_tree_add_text(tree, tvb, 0, 0, msg);
- expert_add_info_format(pinfo, i, PI_UNDECODED, PI_WARN, msg);
+ expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, msg);
call_dissector(data_handle, tvb, pinfo, tree);
return;
} else {
- proto_item* i = proto_tree_add_item(tree,proto_user_encap,tvb,0,0,FALSE);
- proto_item_set_text(i,"DLT: %d",pinfo->match_port + 147 - WTAP_ENCAP_USER0);
+ proto_item* item = proto_tree_add_item(tree,proto_user_encap,tvb,0,0,FALSE);
+ proto_item_set_text(item,"DLT: %d",pinfo->match_port + 147 - WTAP_ENCAP_USER0);
}
len = tvb_reported_length(tvb) - (encap->header_size + encap->trailer_size);