diff options
author | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:02:11 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:02:11 +0000 |
commit | 0f0c111119811cf1c6c9353efdaaef302aca5930 (patch) | |
tree | 1184b3876ae3b638c401313def0c8172b475b3f0 /epan/dissectors/packet-kismet.c | |
parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-kismet.c')
-rw-r--r-- | epan/dissectors/packet-kismet.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 24d504fa03..352edd3a29 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -112,20 +112,18 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * da is_continuation = response_is_continuation (line); } - if (check_col(pinfo->cinfo, COL_INFO)) { - /* - * Put the first line from the buffer into the summary - * if it's a kismet request or reply (but leave out the - * line terminator). - * Otherwise, just call it a continuation. - */ - if (is_continuation) - col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); - else - col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", + /* + * Put the first line from the buffer into the summary + * if it's a kismet request or reply (but leave out the + * line terminator). + * Otherwise, just call it a continuation. + */ + if (is_continuation) + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); + else + col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", is_request ? "Request" : "Response", format_text(line, linelen)); - } if (tree) { ti = proto_tree_add_item(tree, proto_kismet, tvb, offset, -1, ENC_NA); |