diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
commit | e971354a546be5efc284c72e49689a2e337bc198 (patch) | |
tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /asn1/x411 | |
parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'asn1/x411')
-rw-r--r-- | asn1/x411/packet-x411-template.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c index b170cbda8c..16ef5e59db 100644 --- a/asn1/x411/packet-x411-template.c +++ b/asn1/x411/packet-x411-template.c @@ -140,8 +140,7 @@ dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tre tree = proto_item_add_subtree(item, ett_x411); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Transfer"); @@ -182,8 +181,7 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_x411, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_x411); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); |