aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-03-31 21:34:31 -0400
committerAnders Broman <a.broman58@gmail.com>2016-04-01 04:39:44 +0000
commit73957b4f44054a5f5fd013cf64b0bf80d8afd6e1 (patch)
tree5fab4bf990c4ad5344901019149b4a0756b9bce1
parentc119296504b5258f9e44e23b298ea6b6394d6d92 (diff)
Rename json.member.key -> json.key to keep it on the same layer as json.value
Bug: 12300 Change-Id: I636c086d2dd9c950c35724d3e6b8dbf712e9e147 Reviewed-on: https://code.wireshark.org/review/14744 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-json.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c
index c4a1d5bfbd..044403b7b9 100644
--- a/epan/dissectors/packet-json.c
+++ b/epan/dissectors/packet-json.c
@@ -64,8 +64,8 @@ static header_field_info hfi_json_object JSON_HFI_INIT =
static header_field_info hfi_json_member JSON_HFI_INIT =
{ "Member", "json.member", FT_NONE, BASE_NONE, NULL, 0x00, "JSON object member", HFILL };
-static header_field_info hfi_json_member_key JSON_HFI_INIT =
- { "Key", "json.member.key", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL };
+static header_field_info hfi_json_key JSON_HFI_INIT =
+ { "Key", "json.key", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL };
static header_field_info hfi_json_value_string JSON_HFI_INIT = /* FT_STRINGZ? */
{ "String value", "json.value.string", FT_STRING, STR_UNICODE, NULL, 0x00, "JSON string value", HFILL };
@@ -236,7 +236,7 @@ static void after_member(void *tvbparse_data, const void *wanted_data _U_, tvbpa
if (key_tok && key_tok->id == JSON_TOKEN_STRING) {
char *key = json_string_unescape(key_tok);
- proto_tree_add_string(tree, &hfi_json_member_key, key_tok->tvb, key_tok->offset, key_tok->len, key);
+ proto_tree_add_string(tree, &hfi_json_key, key_tok->tvb, key_tok->offset, key_tok->len, key);
proto_item_append_text(tree, " Key: %s", key);
}
}
@@ -619,7 +619,7 @@ proto_register_json(void)
&hfi_json_array,
&hfi_json_object,
&hfi_json_member,
- &hfi_json_member_key,
+ &hfi_json_key,
&hfi_json_value_string,
&hfi_json_value_number,
&hfi_json_value_false,