diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 19:50:43 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 19:50:43 +0000 |
| commit | 8d3dd59976ca5a8851a57f28e8c7d6a0f22062e0 (patch) | |
| tree | 0083ccd6d10e85a85ef9e7138089163c7ddd5b56 /epan/dissectors/packet-ncp2222.inc | |
| parent | 9400890e86b26e71f7a382ddcc3f25e4366c2f3a (diff) | |
Remove check_col() guard
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30124 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ncp2222.inc')
| -rw-r--r-- | epan/dissectors/packet-ncp2222.inc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index 0100ee50c8..baa5fe42b7 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -9188,10 +9188,8 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo, expert_item = proto_tree_add_item(ncp_tree, hf_ncp_connection_status, tvb, 7, 1, FALSE); if (conn_stat != 0 && conn_stat != 0x40 ) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, "Error: Bad Connection Status"); - } if (ncp_echo_err) { expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, @@ -12055,15 +12053,9 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo, /* Fill in the INFO column. */ if (ncp_rec) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDS"); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, "C Ping for NDS"); - } + col_set_str(pinfo->cinfo, COL_INFO, "C Ping for NDS"); } if (!pinfo->fd->flags.visited) |