diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
| commit | 6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (patch) | |
| tree | ef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-aim.c | |
| parent | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (diff) | |
| download | wireshark-6110a96f689d51c92c5b00b4dfda3a9cd6916a25.tar.gz wireshark-6110a96f689d51c92c5b00b4dfda3a9cd6916a25.tar.bz2 wireshark-6110a96f689d51c92c5b00b4dfda3a9cd6916a25.zip | |
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
Diffstat (limited to 'epan/dissectors/packet-aim.c')
| -rw-r--r-- | epan/dissectors/packet-aim.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 4446de7a51..9a1516580b 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -881,9 +881,7 @@ static void dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, static void dissect_aim_flap_err(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, "FLAP error"); - } + col_set_str(pinfo->cinfo, COL_INFO, "FLAP error"); /* Show the undissected payload */ if (tvb_length_remaining(tvb, offset) > 0) @@ -893,9 +891,7 @@ static void dissect_aim_flap_err(tvbuff_t *tvb, packet_info *pinfo, static void dissect_aim_keep_alive(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, "Keep Alive"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Keep Alive"); /* Show the undissected payload */ if (tvb_length_remaining(tvb, offset) > 0) @@ -905,9 +901,7 @@ static void dissect_aim_keep_alive(tvbuff_t *tvb, packet_info *pinfo, static void dissect_aim_close_conn(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, "Close Connection"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Close Connection"); offset = dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, client_tlvs); } @@ -915,9 +909,7 @@ static void dissect_aim_close_conn(tvbuff_t *tvb, packet_info *pinfo, static void dissect_aim_unknown_channel(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, "Unknown Channel"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Unknown Channel"); /* Show the undissected payload */ if (tvb_length_remaining(tvb, offset) > 0) |