diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:21:23 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:21:23 +0000 |
commit | 00810ff19994509f4f8a080286ad43f5156e76c2 (patch) | |
tree | 687e12b760b8702534057b7348f27994c86b617d /epan/dissectors/packet-ositp.c | |
parent | 830dd8e8f05e39238b97857e161821a41ff985df (diff) |
* Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards
svn path=/trunk/; revision=30127
Diffstat (limited to 'epan/dissectors/packet-ositp.c')
-rw-r--r-- | epan/dissectors/packet-ositp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 15c9b424e2..bbd25fc0fd 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -1561,8 +1561,7 @@ static int ositp_decode_UD(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, proto_tree *cltp_tree = NULL; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "UD TPDU"); + col_append_str(pinfo->cinfo, COL_INFO, "UD TPDU"); if (tree) { ti = proto_tree_add_item(tree, proto_cltp, tvb, offset, li + 1, FALSE); @@ -1622,13 +1621,11 @@ static gint dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo, while (tvb_offset_exists(tvb, offset)) { if (!first_tpdu) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); expert_add_info_format(pinfo, NULL, PI_SEQUENCE, PI_NOTE, "Multiple TPDUs in one packet"); } if ((li = tvb_get_guint8(tvb, offset + P_LI)) == 0) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Length indicator is zero"); + col_append_str(pinfo->cinfo, COL_INFO, "Length indicator is zero"); if (!first_tpdu) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); |