aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2018-11-01 07:48:25 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2018-11-01 07:49:02 +0000
commit4a5812aca2a388580f32140a7212d0da4eca0162 (patch)
tree241d9247f157b2fd68849a12f65dda28feee7b97 /epan/proto.c
parentbcaf997f8af1ac0c718140977d1b4f98a3321533 (diff)
Revert "FT_BYTES: fix dissection of FT_BYTES when using SEP_SPACE and "NONE" options"
This reverts commit 0457e6041942776ecff9d4377fc0ce5a340dbb7a. Change-Id: Id39722872efbe98648754d7543da7ae5b08f8b67 Reviewed-on: https://code.wireshark.org/review/30451 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/proto.c b/epan/proto.c
index f825f0d2bc..650318a55a 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -7849,7 +7849,6 @@ tmp_fld_check_assert(header_field_info *hfinfo)
*/
switch (FIELD_DISPLAY(hfinfo->display)) {
case BASE_NONE:
- case SEP_NONE:
case SEP_DOT:
case SEP_DASH:
case SEP_COLON:
@@ -7857,7 +7856,7 @@ tmp_fld_check_assert(header_field_info *hfinfo)
break;
default:
tmp_str = val_to_str_wmem(NULL, hfinfo->display, hf_display, "(Bit count: %d)");
- g_error("Field '%s' (%s) is an byte array but is being displayed as %s instead of BASE_NONE, SEP_NONE, SEP_DOT, SEP_DASH, SEP_COLON, or SEP_SPACE\n",
+ g_error("Field '%s' (%s) is an byte array but is being displayed as %s instead of BASE_NONE, SEP_DOT, SEP_DASH, SEP_COLON, or SEP_SPACE\n",
hfinfo->name, hfinfo->abbrev, tmp_str);
wmem_free(NULL, tmp_str);
}