aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dcp-etsi.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 07:59:51 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 07:59:51 +0000
commit6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (patch)
treeef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-dcp-etsi.c
parent0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (diff)
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
Diffstat (limited to 'epan/dissectors/packet-dcp-etsi.c')
-rw-r--r--epan/dissectors/packet-dcp-etsi.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index d614c2a47b..2e2c111027 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -450,9 +450,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
guint16 rsk=0, rsz=0;
pinfo->current_proto = "DCP-PFT";
- if (check_col (pinfo->cinfo, COL_PROTOCOL)) {
- col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP-PFT");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-PFT");
if (tree) { /* we are being asked for details */
ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, FALSE);
@@ -555,9 +553,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
tvbuff_t *next_tvb = NULL;
pinfo->current_proto = "DCP-AF";
- if (check_col (pinfo->cinfo, COL_PROTOCOL)) {
- col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP-AF");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-AF");
if (tree) { /* we are being asked for details */
ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, FALSE);
@@ -630,9 +626,7 @@ dissect_tpl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
guint16 maj, min;
pinfo->current_proto = "DCP-TPL";
- if (check_col (pinfo->cinfo, COL_PROTOCOL)) {
- col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP-TPL");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-TPL");
if(tree) {
proto_item *ti = NULL;