diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 21:27:44 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 21:27:44 +0000 |
| commit | 04d526a9146e4a1909c4ccd8a46976d97dfd4b93 (patch) | |
| tree | 830e15b5dde8909330b33fea591aa2e7391e023c /asn1/h225 | |
| parent | 526891f1b4166f3bc02a16df86375c8e8cb288da (diff) | |
check_col.diff
Remove redundant calls to check_col() in the template files and regenerate.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394
svn path=/trunk/; revision=31521
Diffstat (limited to 'asn1/h225')
| -rw-r--r-- | asn1/h225/packet-h225-template.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index a2ec0c36d2..a7c28c5768 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -162,9 +162,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * next_tvb_init(&h245_list); next_tvb_init(&tp_list); - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); col_clear(pinfo->cinfo, COL_INFO); it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS"); @@ -172,7 +170,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * offset = dissect_H323_UserInformation_PDU(tvb, pinfo, tr); - if (h245_list.count && check_col(pinfo->cinfo, COL_PROTOCOL)){ + if (h245_list.count){ col_append_str(pinfo->cinfo, COL_PROTOCOL, "/"); col_set_fence(pinfo->cinfo, COL_PROTOCOL); } @@ -200,9 +198,7 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree reset_h225_packet_info(h225_pi); h225_pi->msg_type = H225_RAS; - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); it=proto_tree_add_protocol_format(tree, proto_h225, tvb, offset, tvb_length(tvb), PSNAME" RAS"); tr=proto_item_add_subtree(it, ett_h225); |