From fa5b45834b3199bc3c47b3d328d54e0504d7b942 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Fri, 14 Jun 2013 01:56:28 +0000 Subject: Remove check_col() and the occasional tree. svn path=/trunk/; revision=49921 --- epan/dissectors/packet-pw-cesopsn.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'epan/dissectors/packet-pw-cesopsn.c') diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index c5f7218465..4ba386d7b6 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -221,29 +221,26 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original /* fill up columns*/ col_set_str(pinfo->cinfo, COL_PROTOCOL, shortname); - if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); + if (properties & PWC_ANYOF_CW_BAD) { - col_clear(pinfo->cinfo, COL_INFO); - if (properties & PWC_ANYOF_CW_BAD) - { - col_append_str(pinfo->cinfo, COL_INFO, "CW:Bad, "); - } - else if (properties & PWC_ANYOF_CW_SUSPECT) - { - col_append_str(pinfo->cinfo, COL_INFO, "CW:Suspect, "); - } + col_append_str(pinfo->cinfo, COL_INFO, "CW:Bad, "); + } + else if (properties & PWC_ANYOF_CW_SUSPECT) + { + col_append_str(pinfo->cinfo, COL_INFO, "CW:Suspect, "); + } - if (properties & PWC_PAY_SIZE_BAD) - { - col_append_str(pinfo->cinfo, COL_INFO, "Payload size:Bad, "); - } + if (properties & PWC_PAY_SIZE_BAD) + { + col_append_str(pinfo->cinfo, COL_INFO, "Payload size:Bad, "); + } - col_append_fstr(pinfo->cinfo, COL_INFO, "TDM octets:%d", (int)payload_size); + col_append_fstr(pinfo->cinfo, COL_INFO, "TDM octets:%d", (int)payload_size); - if (padding_size != 0) - { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Padding:%d", (int)padding_size); - } + if (padding_size != 0) + { + col_append_fstr(pinfo->cinfo, COL_INFO, ", Padding:%d", (int)padding_size); } { -- cgit v1.2.3