From be0da16d5ce65e9d6d538a4917b51d3d15269dea Mon Sep 17 00:00:00 2001 From: stig Date: Tue, 25 Oct 2011 10:48:20 +0000 Subject: Simplified code checking if FT_UINT64 is displayed as BASE_NONE. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39560 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/proto.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'epan/proto.c') diff --git a/epan/proto.c b/epan/proto.c index 401e1b979a..167a996c13 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -4924,6 +4924,7 @@ static void tmp_fld_check_assert(header_field_info *hfinfo) { case FT_UINT16: case FT_UINT24: case FT_UINT32: + case FT_UINT64: if (hfinfo->strings == NULL) { /* Require integral types (other than frame number, * which is always displayed in decimal) to have a @@ -4935,13 +4936,6 @@ static void tmp_fld_check_assert(header_field_info *hfinfo) { } break; - case FT_UINT64: - if (hfinfo->display == BASE_NONE) - g_error("Field '%s' (%s) is an integral value (%s) but is being displayed as BASE_NONE\n", - hfinfo->name, hfinfo->abbrev, - val_to_str(hfinfo->type, hf_types, "(Unknown: %d)")); - break; - case FT_PROTOCOL: case FT_FRAMENUM: if (hfinfo->display != BASE_NONE) -- cgit v1.2.3