diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:36:13 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:36:13 +0000 |
| commit | b2e9a22ec53becba2c23777ffee4ff375d135698 (patch) | |
| tree | 794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors/packet-fr.c | |
| parent | d629eac134867d997a496115fd1a04090f149fe7 (diff) | |
Don't guard col_clear with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29344 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-fr.c')
| -rw-r--r-- | epan/dissectors/packet-fr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index de5326307b..95f1437d0a 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -412,8 +412,7 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (has_direction) { if (pinfo->pseudo_header->x25.flags & FROM_DCE) { @@ -670,8 +669,7 @@ static void dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fr_tree = NULL; col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_fr, tvb, 0, -1, "Frame Relay"); |