diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-02-21 14:24:11 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-02-22 13:32:01 +0000 |
| commit | d1f5b376fa1309fc1fed66ee5a8cad0b9ad5d7aa (patch) | |
| tree | 23d52cf75f3874e33c73bf2c7959279088f54b46 /epan/dissectors/packet-http-urlencoded.c | |
| parent | 7e55f4102cd91497713daabff10f2acd006e7299 (diff) | |
Resolve hf_ field name conflicts with protocol strings.
Change-Id: Ie719e2f14c6eaf536035ab30dcb40e91c431c6e4
Reviewed-on: https://code.wireshark.org/review/14061
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-http-urlencoded.c')
| -rw-r--r-- | epan/dissectors/packet-http-urlencoded.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-http-urlencoded.c b/epan/dissectors/packet-http-urlencoded.c index 5b09d461d5..aca2185aaa 100644 --- a/epan/dissectors/packet-http-urlencoded.c +++ b/epan/dissectors/packet-http-urlencoded.c @@ -36,9 +36,6 @@ static header_field_info *hfi_urlencoded = NULL; #define URLENCODED_HFI_INIT HFI_INIT(proto_urlencoded) -static header_field_info hfi_form_keyvalue URLENCODED_HFI_INIT = - { "Form item", "urlencoded-form", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }; - static header_field_info hfi_form_key URLENCODED_HFI_INIT = { "Key", "urlencoded-form.key", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; @@ -153,9 +150,7 @@ dissect_form_urlencoded(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi const int start_offset = offset; char *key, *value; - ti = proto_tree_add_item(url_tree, &hfi_form_keyvalue, tvb, offset, 0, ENC_NA); - - sub = proto_item_add_subtree(ti, ett_form_keyvalue); + sub = proto_tree_add_subtree(url_tree, tvb, offset, 0, ett_form_keyvalue, &ti, "Form item"); next_offset = get_form_key_value(tvb, &key, offset, '='); if (next_offset == -1) @@ -184,7 +179,6 @@ proto_register_http_urlencoded(void) { #ifndef HAVE_HFI_SECTION_INIT static header_field_info *hfi[] = { - &hfi_form_keyvalue, &hfi_form_key, &hfi_form_value, }; |