diff options
| author | João Valverde <j@v6e.pt> | 2021-11-30 02:53:49 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2021-12-03 04:35:56 +0000 |
| commit | 19dcb725b61e384f665ad4b955f3b78f63e626d9 (patch) | |
| tree | 57befb0e933a566cefc32447df49397189939d75 /epan/dissectors/packet-afp.c | |
| parent | 7e99bbf32b73f3dd09c0ee6c1d3ac02a7e988f61 (diff) | |
epan: Remove STR_ASCII and STR_UNICODE
These display bases work to replace unprintable characters so the
name is a misnomer. In addition they are the same option and this
display behaviour is not something that is configurable.
This does not affect encodings because all our internal text strings
need to be valid UTF-8 and the source encoding is specified using
ENC_*.
Remove the assertion for valid UTF-8 in proto.c because
tvb_get_*_string() must return a valid UTF-8 string, always, and we
don't need to assert that, it is expensive.
Diffstat (limited to 'epan/dissectors/packet-afp.c')
| -rw-r--r-- | epan/dissectors/packet-afp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 0b50ba66a8..9107402e15 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -7052,27 +7052,27 @@ proto_register_afp(void) { &hf_afp_utf8_server_name, { "UTF-8 server name", "afp.utf8_server_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_name, { "Server name", "afp.server_name", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_type, { "Server type", "afp.server_type", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_vers, { "AFP version", "afp.server_vers", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_uams, { "UAM", "afp.server_uams", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_icon, @@ -7082,7 +7082,7 @@ proto_register_afp(void) { &hf_afp_server_directory, { "Directory service", "afp.server_directory", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, "Server directory service", HFILL }}, { &hf_afp_server_signature, |