diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-01 15:14:59 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-01 15:14:59 +0000 |
| commit | 12dd69e0b680e4b483656b850ed33d3d47bf222e (patch) | |
| tree | e8072c4eaa5542f9d9199259f81b523897ff459e /epan/xdlc.c | |
| parent | df5848517fea346d72ac8fc30c6f9582bc2d66f0 (diff) | |
Remove check_col.
svn path=/trunk/; revision=52316
Diffstat (limited to 'epan/xdlc.c')
| -rw-r--r-- | epan/xdlc.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/epan/xdlc.c b/epan/xdlc.c index d11ff0e699..f9578eab3d 100644 --- a/epan/xdlc.c +++ b/epan/xdlc.c @@ -296,12 +296,11 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, frame_type, (control & XDLC_N_R_MASK) >> XDLC_N_R_SHIFT); } - if (check_col(pinfo->cinfo, COL_INFO)) { - if (append_info) { - col_append_str(pinfo->cinfo, COL_INFO, ", "); - col_append_str(pinfo->cinfo, COL_INFO, info); - } else - col_add_str(pinfo->cinfo, COL_INFO, info); + if (append_info) { + col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, info); + } else { + col_add_str(pinfo->cinfo, COL_INFO, info); } if (xdlc_tree) { tc = proto_tree_add_uint_format(xdlc_tree, hf_xdlc_control, tvb, @@ -355,12 +354,11 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, (is_response ? " F" : " P") : ""), modifier); - if (check_col(pinfo->cinfo, COL_INFO)) { - if (append_info) { - col_append_str(pinfo->cinfo, COL_INFO, ", "); - col_append_str(pinfo->cinfo, COL_INFO, info); - } else - col_add_str(pinfo->cinfo, COL_INFO, info); + if (append_info) { + col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, info); + } else { + col_add_str(pinfo->cinfo, COL_INFO, info); } if (xdlc_tree) { tc = proto_tree_add_uint_format(xdlc_tree, hf_xdlc_control, tvb, @@ -407,12 +405,11 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, (control & XDLC_N_R_MASK) >> XDLC_N_R_SHIFT, (control & XDLC_N_S_MASK) >> XDLC_N_S_SHIFT); } - if (check_col(pinfo->cinfo, COL_INFO)) { - if (append_info) { - col_append_str(pinfo->cinfo, COL_INFO, ", "); - col_append_str(pinfo->cinfo, COL_INFO, info); - } else - col_add_str(pinfo->cinfo, COL_INFO, info); + if (append_info) { + col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, info); + } else { + col_add_str(pinfo->cinfo, COL_INFO, info); } if (xdlc_tree) { tc = proto_tree_add_uint_format(xdlc_tree, hf_xdlc_control, tvb, |