From 8f6a640337d0554a74702ac877928478ed067ea8 Mon Sep 17 00:00:00 2001 From: Simon Holesch Date: Fri, 10 Dec 2021 22:34:55 +0100 Subject: [PATCH] epan: Allow FT_UINT_STRING for proto_tree_add_string() Since cbd3c447 ("ftypes: Add FT_UINT_STRING to IS_FT_STRING() macro") proto_tree_add_string() accepts FT_UINT_STRING, but the API check still fails. Update the API check to reflect that change. --- epan/proto.h | 2 +- tools/check_typed_item_calls.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epan/proto.h b/epan/proto.h index 9e23797673..c75bd1262c 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -261,7 +261,7 @@ void proto_report_dissector_bug(const char *format, ...) IS_FT_UINT((hfinfo)->type)) #define __DISSECTOR_ASSERT_FIELD_TYPE_IS_STRING(hfinfo) \ - (REPORT_DISSECTOR_BUG("%s:%u: field %s is not of type FT_STRING, FT_STRINGZ, FT_STRINGZPAD, or FT_STRINGZTRUNC", \ + (REPORT_DISSECTOR_BUG("%s:%u: field %s is not of type FT_STRING, FT_STRINGZ, FT_STRINGZPAD, FT_STRINGZTRUNC, or FT_UINT_STRING", \ __FILE__, __LINE__, (hfinfo)->abbrev)) #define DISSECTOR_ASSERT_FIELD_TYPE_IS_STRING(hfinfo) \ diff --git a/tools/check_typed_item_calls.py b/tools/check_typed_item_calls.py index af4aecaeb5..42a5442d06 100755 --- a/tools/check_typed_item_calls.py +++ b/tools/check_typed_item_calls.py @@ -537,9 +537,9 @@ apiChecks.append(APICheck('proto_tree_add_float_format_value', { 'FT_FLOAT'})) apiChecks.append(APICheck('proto_tree_add_double', { 'FT_DOUBLE'})) apiChecks.append(APICheck('proto_tree_add_double_format', { 'FT_DOUBLE'})) apiChecks.append(APICheck('proto_tree_add_double_format_value', { 'FT_DOUBLE'})) -apiChecks.append(APICheck('proto_tree_add_string', { 'FT_STRING', 'FT_STRINGZ', 'FT_STRINGZPAD', 'FT_STRINGZTRUNC'})) -apiChecks.append(APICheck('proto_tree_add_string_format', { 'FT_STRING', 'FT_STRINGZ', 'FT_STRINGZPAD', 'FT_STRINGZTRUNC'})) -apiChecks.append(APICheck('proto_tree_add_string_format_value', { 'FT_STRING', 'FT_STRINGZ', 'FT_STRINGZPAD', 'FT_STRINGZTRUNC'})) +apiChecks.append(APICheck('proto_tree_add_string', { 'FT_STRING', 'FT_STRINGZ', 'FT_UINT_STRING', 'FT_STRINGZPAD', 'FT_STRINGZTRUNC'})) +apiChecks.append(APICheck('proto_tree_add_string_format', { 'FT_STRING', 'FT_STRINGZ', 'FT_UINT_STRING', 'FT_STRINGZPAD', 'FT_STRINGZTRUNC'})) +apiChecks.append(APICheck('proto_tree_add_string_format_value', { 'FT_STRING', 'FT_STRINGZ', 'FT_UINT_STRING', 'FT_STRINGZPAD', 'FT_STRINGZTRUNC'})) apiChecks.append(APICheck('proto_tree_add_guid', { 'FT_GUID'})) apiChecks.append(APICheck('proto_tree_add_oid', { 'FT_OID'})) apiChecks.append(APICheck('proto_tree_add_none_format', { 'FT_NONE'}))