aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-aim.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 07:01:26 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 07:01:26 +0000
commit4b6090e5766e315090c2f3d15cb3368d98168be9 (patch)
treed037fcc527744affba9a5d599723b9be8f4f6d2c /epan/dissectors/packet-aim.c
parent24ca3c44c9e72bb95ed5f3bb9608600555de368e (diff)
Don't guard col_set_str (COL_INFO) with col_check
svn path=/trunk/; revision=29342
Diffstat (limited to 'epan/dissectors/packet-aim.c')
-rw-r--r--epan/dissectors/packet-aim.c6
1 files changed, 2 insertions, 4 deletions
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);