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-opsi.c | |
| parent | 0f0c111119811cf1c6c9353efdaaef302aca5930 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
Diffstat (limited to 'epan/dissectors/packet-opsi.c')
| -rw-r--r-- | epan/dissectors/packet-opsi.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index 492b1dff0c..54ce51e86c 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -559,19 +559,17 @@ dissect_opsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "OPSI"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - if (tvb_length(tvb) < CODE_OFFSET+1) { - col_set_str(pinfo->cinfo, COL_INFO, "Open Policy Service Interface"); - } - else { - col_add_fstr(pinfo->cinfo, COL_INFO, "Open Policy Service Interface, %s", - val_to_str(tvb_get_guint8(tvb, CODE_OFFSET), opsi_opcode, - "<Unknown opcode %d>")); - } + col_clear(pinfo->cinfo, COL_INFO); + if (tvb_length(tvb) < CODE_OFFSET+1) { + col_set_str(pinfo->cinfo, COL_INFO, "Open Policy Service Interface"); + } + else { + col_add_fstr(pinfo->cinfo, COL_INFO, "Open Policy Service Interface, %s", + val_to_str(tvb_get_guint8(tvb, CODE_OFFSET), opsi_opcode, + "<Unknown opcode %d>")); } } - else if (check_col(pinfo->cinfo, COL_INFO) && (tvb_length(tvb) > CODE_OFFSET)) { + else if (tvb_length(tvb) > CODE_OFFSET) { col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(tvb_get_guint8(tvb, CODE_OFFSET), opsi_opcode, "<Unknown opcode %d>")); |