diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-04-27 05:55:54 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-04-27 05:55:54 +0000 |
| commit | 9c9585c9ea515cd90fbf1ed54149d1470d8808c9 (patch) | |
| tree | ef5d340a5fe0a30810908eda750a063c257ac314 /epan/dissectors/packet-dcc.c | |
| parent | a9b2736861db7401acfc21a602e66bde96d743f4 (diff) | |
Remove check_col().
svn path=/trunk/; revision=36894
Diffstat (limited to 'epan/dissectors/packet-dcc.c')
| -rw-r--r-- | epan/dissectors/packet-dcc.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 96c6071183..93c937ae7e 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -230,14 +230,12 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; is_response = pinfo->srcport == DCC_PORT; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, - "%s: %s", - is_response ? "Response" : "Request", - val_to_str(tvb_get_guint8(tvb, offset+3), - dcc_op_vals, "Unknown Op: %u") - ); - } + col_add_fstr(pinfo->cinfo, COL_INFO, + "%s: %s", + is_response ? "Response" : "Request", + val_to_str(tvb_get_guint8(tvb, offset+3), + dcc_op_vals, "Unknown Op: %u") + ); if (tree) { ti = proto_tree_add_item(tree, proto_dcc, tvb, offset, -1, @@ -351,11 +349,9 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) aop = tvb_get_guint8(tvb, offset+4); proto_tree_add_item(dcc_optree, hf_dcc_adminop, tvb, offset+4, 1, FALSE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", - val_to_str(tvb_get_guint8(tvb,offset+4), - dcc_adminop_vals, "Unknown (%u)")); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", + val_to_str(tvb_get_guint8(tvb,offset+4), + dcc_adminop_vals, "Unknown (%u)")); if (aop == DCC_AOP_TRACE_ON || aop == DCC_AOP_TRACE_OFF ) { @@ -374,11 +370,9 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(dcc_optree, hf_dcc_floodop, tvb, offset, 4, FALSE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", - val_to_str(tvb_get_ntohl(tvb,offset), - dcc_floodop_vals, "Unknown (%u)")); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", + val_to_str(tvb_get_ntohl(tvb,offset), + dcc_floodop_vals, "Unknown (%u)")); } else { |