From 4b6090e5766e315090c2f3d15cb3368d98168be9 Mon Sep 17 00:00:00 2001 From: Kovarththanan Rajaratnam Date: Sun, 9 Aug 2009 07:01:26 +0000 Subject: Don't guard col_set_str (COL_INFO) with col_check svn path=/trunk/; revision=29342 --- epan/dissectors/packet-aim.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-aim.c') diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index a51e9787a9..4446de7a51 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -527,8 +527,7 @@ static void dissect_aim_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIM"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger"); + col_set_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger"); /* get relevant header information */ offset += 1; /* XXX - put the identifier into the tree? */ @@ -710,8 +709,7 @@ void aim_init_family(int proto, int ett, guint16 family, const aim_subtype *subt static void dissect_aim_newconn(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "New Connection"); + col_set_str(pinfo->cinfo, COL_INFO, "New Connection"); if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_item(tree, hf_aim_version, tvb, offset, 4, FALSE); -- cgit v1.2.3