check_col.diff
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 13 Jan 2010 21:27:44 +0000 (21:27 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 13 Jan 2010 21:27:44 +0000 (21:27 +0000)
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

asn1/h225/packet-h225-template.c
asn1/h245/packet-h245-template.c
asn1/h282/packet-h282-template.c
asn1/h283/packet-h283-template.c
asn1/h501/packet-h501-template.c
epan/dissectors/packet-h225.c
epan/dissectors/packet-h245.c
epan/dissectors/packet-h282.c
epan/dissectors/packet-h283.c
epan/dissectors/packet-h501.c

index a2ec0c36d23c3c550ec3b081fa7a0281d6f70830..a7c28c57681293f287bb2d835b0fab7c9329e5f7 100644 (file)
@@ -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);
index c29eb89115439d0c9c821e091969c4ac3375ac8a..1c8bf38cfbe3151e966549fb2397f245f7ea236f 100644 (file)
@@ -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);
index aa9f7abc11dda930839dc9d1310d8ecd789e744c..8f99e61cee8b62e49ac5880da86b23fae66339de 100644 (file)
@@ -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);
index 73bdd5f3e883dfbb8b0ee23970436ddb92ea8b4c..642a8051dd7547aa87d32e96f5c0c5057703e604 100644 (file)
@@ -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;
 
index ed089640e4a91c4e9eb47b25cbfaf06307afda28..32a62327ec1c33136f4bfb1708e2609057895c55 100644 (file)
@@ -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);
index 9afdbe7b690c2c3bcddb758acd5d945a22b4ba94..1c20f9f8a94bda61d3e949cfbc244b16d5b1b792 100644 (file)
@@ -7503,7 +7503,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);
        }
@@ -10631,7 +10631,7 @@ void proto_register_h225(void) {
         "h225.NULL", HFILL }},
 
 /*--- End of included file: packet-h225-hfarr.c ---*/
-#line 241 "packet-h225-template.c"
+#line 237 "packet-h225-template.c"
   };
 
   /* List of subtrees */
@@ -10880,7 +10880,7 @@ void proto_register_h225(void) {
     &ett_h225_T_result,
 
 /*--- End of included file: packet-h225-ettarr.c ---*/
-#line 247 "packet-h225-template.c"
+#line 243 "packet-h225-template.c"
   };
   module_t *h225_module;
 
index 3ec6c1d17d2ccd7cf8f6dacc6f7282cc09f963f1..b6ce6af2f65eba8e14ff37a6b6a30e9ae73064eb 100644 (file)
@@ -20141,7 +20141,7 @@ void proto_register_h245(void) {
         "h245.EncryptedAlphanumeric", HFILL }},
 
 /*--- End of included file: packet-h245-hfarr.c ---*/
-#line 466 "packet-h245-template.c"
+#line 464 "packet-h245-template.c"
   };
 
   /* List of subtrees */
@@ -20644,7 +20644,7 @@ void proto_register_h245(void) {
     &ett_h245_MobileMultilinkReconfigurationIndication,
 
 /*--- End of included file: packet-h245-ettarr.c ---*/
-#line 473 "packet-h245-template.c"
+#line 471 "packet-h245-template.c"
   };
   module_t *h245_module;
 
index 0cad1f9f4c16f89cb94c1bd7ef5f58d8e14b2b89..201da92fb29eaec699d939f7f9c659942e5373b5 100644 (file)
@@ -6158,7 +6158,7 @@ void proto_register_h282(void) {
         "h282.NonStandardPDU", HFILL }},
 
 /*--- End of included file: packet-h282-hfarr.c ---*/
-#line 79 "packet-h282-template.c"
+#line 78 "packet-h282-template.c"
   };
 
   /* List of subtrees */
@@ -6312,7 +6312,7 @@ void proto_register_h282(void) {
     &ett_h282_IndicationPDU,
 
 /*--- End of included file: packet-h282-ettarr.c ---*/
-#line 85 "packet-h282-template.c"
+#line 84 "packet-h282-template.c"
   };
 
   /* Register protocol */
index 21bd743c913b91e4b1992a9314c2203024b3b148..2f847a3809c0ce19d35e7ae2f211c285042ef205 100644 (file)
@@ -725,7 +725,7 @@ void proto_register_h283(void) {
         "h283.NULL", HFILL }},
 
 /*--- End of included file: packet-h283-hfarr.c ---*/
-#line 84 "packet-h283-template.c"
+#line 83 "packet-h283-template.c"
   };
 
   /* List of subtrees */
@@ -750,7 +750,7 @@ void proto_register_h283(void) {
     &ett_h283_NonStandardMessage,
 
 /*--- End of included file: packet-h283-ettarr.c ---*/
-#line 90 "packet-h283-template.c"
+#line 89 "packet-h283-template.c"
   };
 
   /* Register protocol */
index 91535e80b9b19ea426f7db86fed00c62fd856473..e4cbf34f3d84f99e802ed95568c234b1fb7b0892 100644 (file)
@@ -3561,7 +3561,7 @@ void proto_register_h501(void) {
         "h501.INTEGER_1_65535", HFILL }},
 
 /*--- End of included file: packet-h501-hfarr.c ---*/
-#line 104 "packet-h501-template.c"
+#line 103 "packet-h501-template.c"
   };
 
   /* List of subtrees */
@@ -3671,7 +3671,7 @@ void proto_register_h501(void) {
     &ett_h501_TerminationCause,
 
 /*--- End of included file: packet-h501-ettarr.c ---*/
-#line 110 "packet-h501-template.c"
+#line 109 "packet-h501-template.c"
   };
 
   /* Register protocol */