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-netlink-netfilter.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-netlink-netfilter.c')
| -rw-r--r-- | epan/dissectors/packet-netlink-netfilter.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-netlink-netfilter.c b/epan/dissectors/packet-netlink-netfilter.c index fcb6e6a2be..509ec8a06f 100644 --- a/epan/dissectors/packet-netlink-netfilter.c +++ b/epan/dissectors/packet-netlink-netfilter.c @@ -708,7 +708,7 @@ static header_field_info hfi_nfct_attr_status NETLINK_NETFILTER_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nfct_help_attr_help_name NETLINK_NETFILTER_HFI_INIT = - { "Helper name", "netlink-netfilter.ct_help_attr.help_name", FT_STRINGZ, STR_UNICODE, + { "Helper name", "netlink-netfilter.ct_help_attr.help_name", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_nfct_help_attr NETLINK_NETFILTER_HFI_INIT = @@ -917,7 +917,7 @@ static header_field_info hfi_nfexp_attr_zone NETLINK_NETFILTER_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nfexp_attr_fn NETLINK_NETFILTER_HFI_INIT = - { "Name", "netlink-netfilter.nfexp.fn", FT_STRINGZ, STR_UNICODE, + { "Name", "netlink-netfilter.nfexp.fn", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; /* CTA_EXPECT_FLAGS bitfield */ @@ -1610,11 +1610,11 @@ static header_field_info hfi_ipset_cadt_attr_cadt_flags NETLINK_NETFILTER_HFI_IN NULL, 0x0, NULL, HFILL }; static header_field_info hfi_ipset_attr_setname NETLINK_NETFILTER_HFI_INIT = - { "Setname", "netlink-netfilter.ipset.setname", FT_STRINGZ, STR_UNICODE, + { "Setname", "netlink-netfilter.ipset.setname", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_ipset_attr_typename NETLINK_NETFILTER_HFI_INIT = - { "Typename", "netlink-netfilter.ipset.typename", FT_STRINGZ, STR_UNICODE, + { "Typename", "netlink-netfilter.ipset.typename", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_ipset_attr_family NETLINK_NETFILTER_HFI_INIT = @@ -1630,7 +1630,7 @@ static header_field_info hfi_ipset_adt_attr NETLINK_NETFILTER_HFI_INIT = VALS(ipset_adt_attr_vals), NLA_TYPE_MASK, NULL, HFILL }; static header_field_info hfi_ipset_adt_attr_comment NETLINK_NETFILTER_HFI_INIT = - { "Comment", "netlink-netfilter.ipset.comment", FT_STRINGZ, STR_UNICODE, + { "Comment", "netlink-netfilter.ipset.comment", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_ipset_ip_attr NETLINK_NETFILTER_HFI_INIT = |