diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-03-28 21:49:47 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-24 11:48:53 +0000 |
| commit | 954fd253e4633a3be080c386e10e6f4ba41350d5 (patch) | |
| tree | 82c2b1299b1241dd848cd7eeea4a7f2ac718a86c /epan/proto.c | |
| parent | 289cbd76d9171b804d601c30d1438d579f4b1c6a (diff) | |
Add duplicate value_string in check filter
Change-Id: Ie00d057f5bc36d65b6bba790169543a65b068e47
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/20744
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/proto.c b/epan/proto.c index 51a402358e..2981cfb2ba 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -7361,13 +7361,14 @@ tmp_fld_check_assert(header_field_info *hfinfo) /* TODO: This check may slow down startup, and output quite a few warnings. It would be good to be able to enable this (and possibly other checks?) in non-release builds. */ -#if 0 +#if ENABLE_CHECK_FILTER /* Check for duplicate value_string values. There are lots that have the same value *and* string, so for now only report those that have same value but different string. */ if ((hfinfo->strings != NULL) && !(hfinfo->display & BASE_RANGE_STRING) && - !(FIELD_DISPLAY(hfinfo->display) == BASE_CUSTOM) && + !(hfinfo->display & BASE_UNIT_STRING) && + !((hfinfo->display & FIELD_DISPLAY_E_MASK) == BASE_CUSTOM) && ( (hfinfo->type == FT_CHAR) || (hfinfo->type == FT_UINT8) || @@ -7377,8 +7378,7 @@ tmp_fld_check_assert(header_field_info *hfinfo) (hfinfo->type == FT_INT8) || (hfinfo->type == FT_INT16) || (hfinfo->type == FT_INT24) || - (hfinfo->type == FT_INT32) || - (hfinfo->type == FT_FRAMENUM) )) { + (hfinfo->type == FT_INT32) )) { int n, m; const value_string *start_values; |