Removed check_col() and the occasional tree.

svn path=/trunk/; revision=49938

1 files changed, 10 insertions, 13 deletions

diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c
index 0deb8bb2ae..977db1e048 100644
--- a/epan/dissectors/packet-nntp.c
+++ b/epan/dissectors/packet-nntp.c
@@ -54,20 +54,17 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "NNTP");
 
-	if (check_col(pinfo->cinfo, COL_INFO)) {
-		/*
-		 * Put the first line from the buffer into the summary
-		 * (but leave out the line terminator).
-		 *
-		 * Note that "tvb_find_line_end()" will return a value that
-		 * is not longer than what's in the buffer, so the
-		 * "tvb_get_ptr()" call won't throw an exception.
-		 */
-		linelen = tvb_find_line_end(tvb, offset, -1, &next_offset,
-		    FALSE);
-		col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", type,
+	/*
+	 * Put the first line from the buffer into the summary
+	 * (but leave out the line terminator).
+	 *
+	 * Note that "tvb_find_line_end()" will return a value that
+	 * is not longer than what's in the buffer, so the
+	 * "tvb_get_ptr()" call won't throw an exception.
+	 */
+	linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+	col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", type,
 		    tvb_format_text(tvb, offset, linelen));
-	}
 
 	if (tree) {
 		ti = proto_tree_add_item(tree, proto_nntp, tvb, offset, -1,