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-fr.c | |
| parent | 0f0c111119811cf1c6c9353efdaaef302aca5930 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
Diffstat (limited to 'epan/dissectors/packet-pw-fr.c')
| -rw-r--r-- | epan/dissectors/packet-pw-fr.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 9bbbe50de6..e12175edd8 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -163,19 +163,16 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) } col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); - if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); + if (packet_quality & PQ_CW_BAD) { - col_clear(pinfo->cinfo, COL_INFO); - if (packet_quality & PQ_CW_BAD) - { - col_append_str(pinfo->cinfo, COL_INFO, "CW:Malformed, "); - } - col_append_fstr(pinfo->cinfo, COL_INFO, "%d payload octets", (int)payload_size); + col_append_str(pinfo->cinfo, COL_INFO, "CW:Malformed, "); + } + col_append_fstr(pinfo->cinfo, COL_INFO, "%d payload octets", (int)payload_size); - if (payload_padding != 0) - { - col_append_fstr(pinfo->cinfo, COL_INFO, ", %d padding", (int)payload_padding); - } + if (payload_padding != 0) + { + col_append_fstr(pinfo->cinfo, COL_INFO, ", %d padding", (int)payload_padding); } { |