diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:56:28 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:56:28 +0000 |
| commit | fa5b45834b3199bc3c47b3d328d54e0504d7b942 (patch) | |
| tree | 721daa2acddb00e486c5c62923f7b6841b4c13eb /epan/dissectors/packet-pw-satop.c | |
| parent | 0f0c111119811cf1c6c9353efdaaef302aca5930 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
Diffstat (limited to 'epan/dissectors/packet-pw-satop.c')
| -rw-r--r-- | epan/dissectors/packet-pw-satop.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 0e2fa67940..332337e345 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -220,27 +220,24 @@ void dissect_pw_satop(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, "); - } + col_append_str(pinfo->cinfo, COL_INFO, "CW:Bad, "); + } - if (properties & PWC_PAY_SIZE_BAD) - { - col_append_str(pinfo->cinfo, COL_INFO, "Payload size:0 (Bad)"); - } - else - { - col_append_fstr(pinfo->cinfo, COL_INFO, "TDM octets:%d", (int)payload_size); - } + if (properties & PWC_PAY_SIZE_BAD) + { + col_append_str(pinfo->cinfo, COL_INFO, "Payload size:0 (Bad)"); + } + else + { + 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); } |