diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-13 20:32:01 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-13 20:32:01 +0000 |
| commit | 63eea3c844d05efbcc6015beb623eee7f781b772 (patch) | |
| tree | 64b368c46b53e0e8f52e80f61ed17e13d64596a5 /epan/dissectors/packet-btrfcomm.c | |
| parent | a361957685ec433b4a52d92623800474d3d39be7 (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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31519 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
| -rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 07ccea0ad7..a58ab5e01d 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -657,9 +657,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* UID frame */ if(frame_type==0xef && dlci && pf_flag) { - if ((check_col(pinfo->cinfo, COL_INFO))){ - col_append_str(pinfo->cinfo, COL_INFO, "UID "); - } + col_append_str(pinfo->cinfo, COL_INFO, "UID "); if((dlci_state->do_credit_fc&0x03)==0x03){ /*QQQ use tvb_length_remaining()==2 and !frame_len as heuristics to catch this as well? */ /* add credit based flow control byte */ @@ -679,9 +677,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 mcc_cr_flag, mcc_ea_flag; int start_offset=offset; - if ((check_col(pinfo->cinfo, COL_INFO))){ - col_append_str(pinfo->cinfo, COL_INFO, "MPX_CTRL "); - } + col_append_str(pinfo->cinfo, COL_INFO, "MPX_CTRL "); mcc_ti = proto_tree_add_text(rfcomm_tree, tvb, offset, 1, "Multiplexer Control Command"); ctrl_tree = proto_item_add_subtree(mcc_ti, ett_btrfcomm_ctrl); |