aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tnef.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2010-01-13 20:32:01 +0000
committerAnders Broman <anders.broman@ericsson.com>2010-01-13 20:32:01 +0000
commit440c3f9261af41a397823a80121cfa0122df1c88 (patch)
tree64b368c46b53e0e8f52e80f61ed17e13d64596a5 /epan/dissectors/packet-tnef.c
parent6343ffb68e3e7ea3b335ad5e443e23f324a99d35 (diff)
From Didier Gautheron:
check_col.diff Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394 svn path=/trunk/; revision=31519
Diffstat (limited to 'epan/dissectors/packet-tnef.c')
-rw-r--r--epan/dissectors/packet-tnef.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index f2d14e20b8..6f6334fba8 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -640,14 +640,11 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static void dissect_tnef_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
- if (check_col(pinfo->cinfo, COL_DEF_SRC))
- col_set_str(pinfo->cinfo, COL_DEF_SRC, PSNAME " encoded file");
+ col_set_str(pinfo->cinfo, COL_DEF_SRC, PSNAME " encoded file");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_str(pinfo->cinfo, COL_INFO, PNAME);
+ col_append_str(pinfo->cinfo, COL_INFO, PNAME);
dissect_tnef(tvb, pinfo, tree);
}