diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-03-29 14:23:21 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-03-29 14:23:21 +0000 |
| commit | ba8a739f4c8d8e83fcfdc12973c92785286f3e20 (patch) | |
| tree | 1984f1c39c2b515d02f2bc1184a8b3128172c4d7 /epan/dissectors/packet-msrp.c | |
| parent | 7356320a2a759188fb77d176e4c1b9dc44e6c02a (diff) | |
Remove check_col().
svn path=/trunk/; revision=36396
Diffstat (limited to 'epan/dissectors/packet-msrp.c')
| -rw-r--r-- | epan/dissectors/packet-msrp.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 81e1fc062e..62a40a0383 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -540,28 +540,24 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSRP"); if (is_msrp_response){ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Response: %s ", - tvb_format_text(tvb, token_3_start, token_3_len)); + col_add_fstr(pinfo->cinfo, COL_INFO, "Response: %s ", + tvb_format_text(tvb, token_3_start, token_3_len)); - if (token_4_len ) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", - tvb_format_text(tvb, token_4_start, token_4_len)); + if (token_4_len ) + col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", + tvb_format_text(tvb, token_4_start, token_4_len)); - col_append_fstr(pinfo->cinfo, COL_INFO, "Transaction ID: %s", - tvb_format_text(tvb, token_2_start, token_2_len)); - } + col_append_fstr(pinfo->cinfo, COL_INFO, "Transaction ID: %s", + tvb_format_text(tvb, token_2_start, token_2_len)); }else{ - if (check_col(pinfo->cinfo, COL_INFO)) { - proto_tree_add_text(tree, tvb, token_3_start, token_3_len, - "Col %s L=%u", tvb_format_text(tvb, token_3_start, token_3_len),token_3_len); + proto_tree_add_text(tree, tvb, token_3_start, token_3_len, + "Col %s L=%u", tvb_format_text(tvb, token_3_start, token_3_len),token_3_len); - col_add_fstr(pinfo->cinfo, COL_INFO, "Request: %s ", - tvb_format_text(tvb, token_3_start, token_3_len)); + col_add_fstr(pinfo->cinfo, COL_INFO, "Request: %s ", + tvb_format_text(tvb, token_3_start, token_3_len)); - col_append_fstr(pinfo->cinfo, COL_INFO, "Transaction ID: %s", - tvb_format_text(tvb, token_2_start, token_2_len)); - } + col_append_fstr(pinfo->cinfo, COL_INFO, "Transaction ID: %s", + tvb_format_text(tvb, token_2_start, token_2_len)); } /* Find the end line to be able to process the headers |