From dfa2156e301539929a12dda54752c778c3ee7a39 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Fri, 14 Jun 2013 02:50:46 +0000 Subject: Remove check_col() and the occasional tree. svn path=/trunk/; revision=49923 --- epan/dissectors/packet-tpncp.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'epan/dissectors/packet-tpncp.c') diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index 5ec37e0e57..b6d0b1e55c 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -266,18 +266,16 @@ static void dissect_tpncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPNCP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - if (pinfo->srcport == UDP_PORT_TPNCP_TRUNKPACK) { - col_add_fstr(pinfo->cinfo, COL_INFO, - "EvID=%s(%d), SeqNo=%d, ChID=%d, Len=%d, Ver=%d", - val_to_str_const(id, tpncp_events_id_vals, "Unknown"), - id, seq_number, cid, len, ver); - } else { - col_add_fstr(pinfo->cinfo, COL_INFO, - "CmdID=%s(%d), SeqNo=%d, Len=%d, Ver=%d", - val_to_str_const(id, tpncp_commands_id_vals, "Unknown"), - id, seq_number, len, ver); - } + if (pinfo->srcport == UDP_PORT_TPNCP_TRUNKPACK) { + col_add_fstr(pinfo->cinfo, COL_INFO, + "EvID=%s(%d), SeqNo=%d, ChID=%d, Len=%d, Ver=%d", + val_to_str_const(id, tpncp_events_id_vals, "Unknown"), + id, seq_number, cid, len, ver); + } else { + col_add_fstr(pinfo->cinfo, COL_INFO, + "CmdID=%s(%d), SeqNo=%d, Len=%d, Ver=%d", + val_to_str_const(id, tpncp_commands_id_vals, "Unknown"), + id, seq_number, len, ver); } if (tree) { -- cgit v1.2.3