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-vlan.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-vlan.c')
| -rw-r--r-- | epan/dissectors/packet-vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 408586b999..d8149029fd 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -168,7 +168,7 @@ static header_field_info hfi_vlan_id VLAN_HFI_INIT = { NULL, 0x0FFF, "VLAN ID", HFILL }; static header_field_info hfi_vlan_id_name VLAN_HFI_INIT = { - "Name", "vlan.id_name", FT_STRING, STR_UNICODE, + "Name", "vlan.id_name", FT_STRING, BASE_NONE, NULL, 0x0, "VLAN ID Name", HFILL }; static header_field_info hfi_vlan_etype VLAN_HFI_INIT = { |