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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31521 f5534014-38df-0310-8fa8-9805f1628bb7

5 files changed, 7 insertions, 16 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);
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index c29eb89115..1c8bf38cfb 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -411,9 +411,7 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	upcoming_channel = NULL;
 	codec_type = NULL;
 
-	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(parent_tree, proto_h245, tvb, 0, tvb_length(tvb), PSNAME);
 	tr=proto_item_add_subtree(it, ett_h245);
diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c
index aa9f7abc11..8f99e61cee 100644
--- a/asn1/h282/packet-h282-template.c
+++ b/asn1/h282/packet-h282-template.c
@@ -61,8 +61,7 @@ dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_item  *ti = NULL;
   proto_tree  *h282_tree = NULL;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
 
   ti = proto_tree_add_item(tree, proto_h282, tvb, 0, -1, FALSE);
   h282_tree = proto_item_add_subtree(ti, ett_h282);
diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c
index 73bdd5f3e8..642a8051dd 100644
--- a/asn1/h283/packet-h283-template.c
+++ b/asn1/h283/packet-h283-template.c
@@ -64,8 +64,7 @@ dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_item  *ti = NULL;
   proto_tree  *h283_tree = NULL;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
 
   info_is_set = FALSE;
 
diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c
index ed089640e4..32a62327ec 100644
--- a/asn1/h501/packet-h501-template.c
+++ b/asn1/h501/packet-h501-template.c
@@ -71,8 +71,7 @@ dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_item  *ti = NULL;
   proto_tree  *h501_tree = NULL;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
 
   ti = proto_tree_add_item(tree, proto_h501, tvb, 0, -1, FALSE);
   h501_tree = proto_item_add_subtree(ti, ett_h501);