diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-26 01:00:15 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-26 01:00:15 +0000 |
| commit | 066ba23f0b466e739d82901aa8e6b79ced4a35b1 (patch) | |
| tree | 162164ef5068debaa5aa3df4cb81f141a302d1a9 /epan/dissectors/packet-ymsg.c | |
| parent | 1c1eb9021a809a54ef766901d072b2bc63522af5 (diff) | |
Fix some gcc -Wshadow warnings
svn path=/trunk/; revision=31673
Diffstat (limited to 'epan/dissectors/packet-ymsg.c')
| -rw-r--r-- | epan/dissectors/packet-ymsg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index 56cffc4dee..b6b333fa9f 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -446,8 +446,8 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Parse and show each line of the contents */ for (;;) { - proto_item *ti = NULL; - proto_tree *content_line_tree = NULL; + proto_item *ti_2; + proto_tree *content_line_tree; /* Don't continue unless there is room for another whole item. (including 2 2-byte delimiters */ @@ -467,10 +467,10 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) valbuf = tvb_format_text(tvb, offset+keylen+2, vallen); /* Add a text item with the key... */ - ti = proto_tree_add_string_format(content_tree, hf_ymsg_content_line, tvb, + ti_2 = proto_tree_add_string_format(content_tree, hf_ymsg_content_line, tvb, offset, keylen+2+vallen+2, "", "%s:%s", keybuf, valbuf); - content_line_tree = proto_item_add_subtree(ti, ett_ymsg_content_line); + content_line_tree = proto_item_add_subtree(ti_2, ett_ymsg_content_line); /* And add the key and value separately inside */ proto_tree_add_item(content_line_tree, hf_ymsg_content_line_key, tvb, |