Don't guard col_clear with col_check

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

diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 1894e8ba4f69cc620e4006094554ef3fbeed7fcb..ec812bad11c0c3cd6ee50592ba338a13e0feb7c1 100644 (file)
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -165,9 +165,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
        if (check_col(pinfo->cinfo, COL_PROTOCOL)){
                col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
        }
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS");
        tr=proto_item_add_subtree(it, ett_h225);

diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c
index 36dc6c01d6581dbd83be81690d807041e8b05422..77a5b781a9ec4201abc752ba0a893940de1cbc09 100644 (file)
--- a/asn1/t125/packet-t125-template.c
+++ b/asn1/t125/packet-t125-template.c
@@ -62,9 +62,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree)
   gint32 tag;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125");
-  if (check_col(pinfo->cinfo, COL_INFO)){
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), FALSE);
   tree = proto_item_add_subtree(item, ett_t125);

diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index d3345e41e2bbf2213418e87bd93aa0067982ad46..d3cca47b223fe4fcc1d9979fc22bf690e4d5e66b 100644 (file)
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -513,9 +513,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        }
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        primary_part = TRUE;
 
@@ -560,9 +558,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint16 ifp_packet_number=1;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        primary_part = TRUE;
 

diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index f5d190b059b0764d373b02c1771a669dae82607b..d209d427dcd95903fb6101b66dfb5de31c17fcb6 100644 (file)
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -1424,9 +1424,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFS (RX)");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        reply = (rxinfo->flags & RX_CLIENT_INITIATED) == 0;
        port = ((reply == 0) ? pinfo->destport : pinfo->srcport );

diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 2c5da98b224d8ba9c5253c32f8286b95cd4c3ef7..1d06064165b83fd6d25792bb4c064e1021bb1517 100644 (file)
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -1093,9 +1093,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     int offset;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMQP");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     if (tree) {
 

diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index c76fa241a7120d8c89f7c7ddc0aae882066659d2..2265db4c7a380fa8c2d7bdfe22b58c0b78d2345f 100644 (file)
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -1367,9 +1367,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ARTNET");
 
   /* Clear out stuff in the info column */
-  if(check_col(pinfo->cinfo,COL_INFO)){
-    col_clear(pinfo->cinfo,COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   if (tree) {
     ti = proto_tree_add_item(tree, proto_artnet, tvb, offset, -1, FALSE);

diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 5ee938020f268ea9f5f821168423d0b3531d924e..648376982c1a61260238d31d75d023e1d113c59d 100644 (file)
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -313,9 +313,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "STP"); /* Spanning Tree Protocol */
   }
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE);
 

diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c
index 709d5be5678353bf6a204b134f5474b8da9b5121..2536993120b9bfd1c9bfa75bbe949fff366423ae 100644 (file)
--- a/epan/dissectors/packet-cfm.c
+++ b/epan/dissectors/packet-cfm.c
@@ -1474,9 +1474,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFM");
 
        /* Clear out stuff in the info column */
-       if (check_col(pinfo->cinfo,COL_INFO)) {
-               col_clear(pinfo->cinfo,COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* provide info column with CFM packet type (opcode)*/
        cfm_pdu_type = tvb_get_guint8(tvb, 1);

diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index 98ab58e9e34b8078cf0dad21b26db3a70f32508e..35fd516a5c0d4b25f13dc1311c003cf1cf788300 100644 (file)
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -1005,9 +1005,7 @@ dissect_ctdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTDB");
-       if(check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if(parent_tree){
                item=proto_tree_add_item(parent_tree, proto_ctdb, tvb, offset,

diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index 2e2c1110278091ee2a15e58090acefb03eeade6e..7cfec3a7e5c59c549f9bee9c3df4654f1d8b74b5 100644 (file)
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -183,9 +183,7 @@ dissect_dcp_etsi (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   pinfo->current_proto = "DCP (ETSI)";
 
   /* Clear out stuff in the info column */
-  if (check_col (pinfo->cinfo, COL_INFO)) {
-    col_clear (pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
   if (check_col (pinfo->cinfo, COL_PROTOCOL)) {
     col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP (ETSI)");
     /*col_append_fstr (pinfo->cinfo, COL_INFO, " tvb %d", tvb_length(tvb));*/

diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index 2a1388c88121d65e3b39a9c07ba8d4381b81f0ee..a66d54729e76047fefdd5ee76ccdfd23ec0b6a60 100644 (file)
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -119,9 +119,7 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       const char *sep;
 
       col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC_STP");
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-           col_clear(pinfo->cinfo, COL_INFO);
-      }
+      col_clear(pinfo->cinfo, COL_INFO);
 
       bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE);
 

diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index b1905076e49fc0e03f5316ee8a946f083c853281..ec99297f0ed784d515da81f4799130667cf9ca28 100644 (file)
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -378,13 +378,9 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     char *addr;
 
     offset = 0;
-    if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
-        col_clear(pinfo->cinfo, COL_PROTOCOL);
-    }
+    col_clear(pinfo->cinfo, COL_PROTOCOL);
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC DNA");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     set_dnet_address(&pinfo->dl_src, &pinfo->net_src);
     set_dnet_address(&pinfo->dl_src, &pinfo->src);

diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c
index 391dc48d7dc8a2f31c33b1c4365c720425c5f7b8..66800aaba2409943d6a8194352f5efb9b92bcf03 100644 (file)
--- a/epan/dissectors/packet-dect.c
+++ b/epan/dissectors/packet-dect.c
@@ -1886,10 +1886,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT");
 
        /* Clear out stuff in the info column */
-       if(check_col(pinfo->cinfo, COL_INFO))
-       {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
        if(tree)
        {
                proto_item *ti          =NULL;

diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index 7193d31ba21e35392a87147f9248f5979676481d..2303fc2e1424826370d0bbfc6306d11dbb1ef61c 100644 (file)
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -1039,10 +1039,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
     /* Clear out stuff in the info column */
-    if(check_col(pinfo->cinfo,COL_INFO))
-    {
-        col_clear(pinfo->cinfo,COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     if(check_col(pinfo->cinfo,COL_INFO))
     {

diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index cfd2e72870e56cb5bcf1c0c1cfa12179ff07e1f2..a56f1a7c0120d96bb470f8e185d7f703b751c608 100644 (file)
--- a/epan/dissectors/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
@@ -704,9 +704,7 @@ dissect_dvmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of
 
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DVMRP");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        if ((tvb_length_remaining(tvb, offset)>=8)

diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c
index 5d21b3c0bd46aeac33743bf7bb7ab14a91b76404..1db73cf98c80cbf84483a42cd6bdb7e6a2362176 100644 (file)
--- a/epan/dissectors/packet-epl_v1.c
+++ b/epan/dissectors/packet-epl_v1.c
@@ -305,9 +305,7 @@ dissect_epl_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                return FALSE;
        }
 
-       if(check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        if(check_col(pinfo->cinfo, COL_INFO)){

diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 3e0c367ee4899dfe09cbe4e6ea4340e35fbb2c47..e7d0b41fa8f5036ff093b2719c963edfc27660e0 100644 (file)
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -235,9 +235,7 @@ dissect_fix_packet(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, "FIX");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* get at least the fix version: 8=FIX.x.x */
     if (fix_marker(tvb, 0) != 0) {

diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 0a698bf518fc0c16a548b95b61fddb2ee5ac9f74..1b215ca07754551c1a62158797d154401cf325b9 100644 (file)
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -7501,9 +7501,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
        if (check_col(pinfo->cinfo, COL_PROTOCOL)){
                col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
        }
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS");
        tr=proto_item_add_subtree(it, ett_h225);

diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 0f5520093e90c90a6fc94d5408f759889b8f0c6d..bceb3136fa800aefb03db4cbd99eaf75f9ac75e3 100644 (file)
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -1013,10 +1013,7 @@ dissect_iax2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
     {
       col_set_str (pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_IAX2);
     }
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_clear (pinfo->cinfo, COL_INFO);
-    }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* add the 'iax2' tree to the main tree */
   if (tree)

diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c
index db6f76b850f2d0f6297aadcdd8505bd7c2619bcd..e24c2f8e8b9d20e59c4a9e17f00d81a9c877274c 100644 (file)
--- a/epan/dissectors/packet-icq.c
+++ b/epan/dissectors/packet-icq.c
@@ -1729,9 +1729,7 @@ dissect_icq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     return 0;  /* This is not a (recognized) ICQ packet */
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQ");
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   version = tvb_get_letohs(tvb, ICQ_VERSION);
   switch (version) {

diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c
index d00e4f4b08a39d5f4424dcab70ba149b0cb2c79f..77fa6b1332c0612fa8b0ce0b4d4a193518e1b7fb 100644 (file)
--- a/epan/dissectors/packet-iec104.c
+++ b/epan/dissectors/packet-iec104.c
@@ -428,9 +428,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
        if (!(check_col(pinfo->cinfo, COL_INFO) || tree))   return; /* Be sure that the function is only called twice */
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu");
-       if (check_col(pinfo->cinfo, COL_INFO))  {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        asduh = ep_alloc(sizeof(struct asduheader));
        res = ep_strbuf_new_label(NULL);
@@ -521,9 +519,7 @@ static void dissect_iec104apci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
        if (!(check_col(pinfo->cinfo, COL_INFO) || tree))   return; /* Be sure that the function is only called twice */
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci");
-       if (check_col(pinfo->cinfo, COL_INFO))  {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        apcih = ep_alloc(sizeof(struct apciheader));
 

diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c
index 16906c93f8d3cfe5a182f9465c23392bdd8cc9fa..11d8a9b5767370220ce65b21a51362ef5eb961ef 100644 (file)
--- a/epan/dissectors/packet-ieee802a.c
+++ b/epan/dissectors/packet-ieee802a.c
@@ -92,9 +92,7 @@ dissect_ieee802a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        int             hf;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE802a");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (tree) {
                ti = proto_tree_add_item(tree, proto_ieee802a, tvb, 0, -1, FALSE);

diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c
index 9565a06da37a95860f6071caafff99cf7d10c18d..533252cb33b01716bc411977425de4d9924f0ff6 100644 (file)
--- a/epan/dissectors/packet-igap.c
+++ b/epan/dissectors/packet-igap.c
@@ -147,9 +147,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off
     tree = proto_item_add_subtree(item, ett_igap);
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGAP");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     type = tvb_get_guint8(tvb, offset);
     if (check_col(pinfo->cinfo, COL_INFO)) {

diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index affaf6fae86de467f5b555be8d698484cbcf71a5..5609c8c403e6ef99d2797c47bc0aa274e799f6f4 100644 (file)
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -910,9 +910,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGMP");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        type = tvb_get_guint8(tvb, offset);

diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c
index c83b8333bda15c9fac134afd2c6d42708c54dd7a..c21308ae1c9d00163de314e969d09de590b652dd 100644 (file)
--- a/epan/dissectors/packet-ipvs-syncd.c
+++ b/epan/dissectors/packet-ipvs-syncd.c
@@ -108,9 +108,7 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPVS");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        cnt = tvb_get_guint8(tvb, offset);
        proto_tree_add_item(tree, hf_conn_count, tvb, offset, 1, FALSE);

diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index e2572575c3ce400fd1322df40dcf831ca9570f27..c49fb01c32ee5738c4f57ea55b28bd70ac5e81f8 100644 (file)
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -84,9 +84,7 @@ static void dissect_kdp(tvbuff_t *tvb,
   int offset;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "KDP");
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
   if (tree) {
     proto_item *ti;
     proto_tree *kdp_tree, *flags_tree;

diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index e994d72d25c14a286ace7e9b1de34e31e9ba301c..06e6d41ec3f4d5f0a90f84613de818a72b7827eb 100644 (file)
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -419,9 +419,7 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8          format, types, wsize;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "XID");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        format = tvb_get_guint8(tvb, 0);
        if (tree) {
@@ -469,9 +467,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t        *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        dsap = tvb_get_guint8(tvb, 0);
        if (tree) {

diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index 127319a11c5cb672a783830cc7762e7ba8933d68..bcc1c9d152f23d224ba85c87558d701e77a04ee0 100644 (file)
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -2468,9 +2468,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLDP");
 
        /* Clear the information column on summary display */
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (tree)
        {

diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index 05b34d7a4ec675c5282bb9e3d205a8482d8bb330..2105ac6d3ab9a5ee96626b60abfac432074d89a1 100644 (file)
--- a/epan/dissectors/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
@@ -204,9 +204,7 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int o
 
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MRDISC");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        type = tvb_get_guint8(tvb, offset);

diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index 6ee5ac4ed3fa3f86136306e888061f2382b937fe..038409d891844cf66d56a75b8b18ad40bc7557fd 100644 (file)
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -234,9 +234,7 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of
 
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSNIP");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        type = tvb_get_guint8(tvb, offset);

diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c
index 087a73a16338404feedcc4f1cf17f3ce5a222bec..e1e0e2df8ccccb6d51c0255d3feba97067c00bb6 100644 (file)
--- a/epan/dissectors/packet-nbd.c
+++ b/epan/dissectors/packet-nbd.c
@@ -193,9 +193,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBD");
 
-       if(check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        item = proto_tree_add_item(parent_tree, proto_nbd, tvb, 0, -1, FALSE);
        tree = proto_item_add_subtree(item, ett_nbd);

diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index f4fb7c12879796eb0c9b6c5f763409ed2fcad610..89a5057f57a3b02a44bcc8b9e0060407a9d48627 100644 (file)
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -3232,9 +3232,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_writable(pinfo->cinfo, TRUE);
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
        if (tree) {
                ndmp_item = proto_tree_add_item(tree, proto_ndmp, tvb, 0, -1, FALSE);
                ndmp_tree = proto_item_add_subtree(ndmp_item, ett_ndmp);

diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c
index 8794970dc2e76bb431988299afe8b09d5ab2bb4a..f01b5a24651ee83dbcffb8c215b0741d18b85c14 100644 (file)
--- a/epan/dissectors/packet-netdump.c
+++ b/epan/dissectors/packet-netdump.c
@@ -101,9 +101,7 @@ dissect_netdump(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Netdump");
        /* Clear out stuff in the info column */
-       if (check_col(pinfo->cinfo,COL_INFO)) {
-               col_clear(pinfo->cinfo,COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (tree) { /* we are being asked for details */
                proto_item *ti = NULL;

diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index e3ceef7af0075d35473732b632de1113d83085a2..8c1abbffa7a8e52acc6eb88f80212ee7e4e6912f 100644 (file)
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -841,9 +841,7 @@ void dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        oui_info_t *oui_info;
                
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NHRP");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
        
        memset(&hdr, 0, sizeof(e_nhrp_hdr));
        

diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c
index d464fb35158ed227604b78e1034cc2c6237c8fbd..683112fb56b6cff3f8a2aae5f11999ccabe25aba 100644 (file)
--- a/epan/dissectors/packet-omapi.c
+++ b/epan/dissectors/packet-omapi.c
@@ -110,10 +110,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "OMAPI");
 
-  if (check_col(pinfo->cinfo, COL_INFO)) 
-  {
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   ti = proto_tree_add_item(tree, proto_omapi, tvb, 0, -1, FALSE);
   omapi_tree = proto_item_add_subtree(ti, ett_omapi);

diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index 37deb42041e9eda1071b5b2ea7033585a23ae556..315690200c78b76800efd97d2e831d4f3bf4841e 100644 (file)
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -199,9 +199,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            col_set_str(pinfo->cinfo, COL_PROTOCOL, "PAGP"); /* PAGP Protocol */
       }
 
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-           col_clear(pinfo->cinfo, COL_INFO);
-      }
+      col_clear(pinfo->cinfo, COL_INFO);
 
       pinfo->current_proto = "PAGP";
 

diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index b161a80dcf75281fa5a8ded9c3aec32209d0e426..7792e3e7dc76a4b607afdb3990c46550b03a66cc 100644 (file)
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -426,10 +426,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item  *ti;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoED");
-       if (check_col(pinfo->cinfo, COL_INFO))
-       {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* Start Decoding Here. */
        pppoe_code = tvb_get_guint8(tvb, 1);
@@ -677,10 +674,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t    *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoES");
-       if (check_col(pinfo->cinfo,COL_INFO))
-       {
-               col_clear(pinfo->cinfo,COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* Start Decoding Here. */
        pppoe_code = tvb_get_guint8(tvb, 1);

diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index 9664a5c2594422a07fa1db9f60b808c3b65ed0b3..9d56ee89b5c74da8eec1011e9e8f4551a83efedc 100644 (file)
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -303,10 +303,7 @@ static void dissect_rdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* Set/clear columns */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDT");
-    if (check_col(pinfo->cinfo, COL_INFO))
-    {
-        col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* Create RDT protocol tree */
     if (tree)

diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c
index 0ae81215f8ffb6ab86a52c8f9087c0affa1ace3f..5233643e9797561d57feb95c4374089ecebac891 100644 (file)
--- a/epan/dissectors/packet-retix-bpdu.c
+++ b/epan/dissectors/packet-retix-bpdu.c
@@ -66,9 +66,7 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   const guint8 *bridge_mac_str;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "R-STP");
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
   bridge_mac_str = tvb_get_ptr(tvb, 10, 6);
   if (check_col(pinfo->cinfo, COL_INFO)){
     col_add_fstr(pinfo->cinfo, COL_INFO, "Bridge MAC %s", ether_to_str(bridge_mac_str)); 

diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c
index 146f08748436172dc29d759b00ea50755d4145be..0a550a48992ae51e3616593156cbeba4382fd77a 100644 (file)
--- a/epan/dissectors/packet-rgmp.c
+++ b/epan/dissectors/packet-rgmp.c
@@ -78,9 +78,7 @@ dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off
     tree = proto_item_add_subtree(item, ett_rgmp);
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "RGMP");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     type = tvb_get_guint8(tvb, offset);
     if (check_col(pinfo->cinfo, COL_INFO)) {

diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index e9088a388c12567949e9b0795b2858a0cd2335d5..bfeab73a6d9b69e1fe32a806e5035917a29affc1 100644 (file)
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -108,9 +108,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        type = tvb_get_guint8(tvb, 0);
 

diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index 83bbc380b0379627ae79de847aca142fa520f685..f759520cb963f578cd76d7bdff74703cb5912677 100644 (file)
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -679,9 +679,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTcfg");
 
   /* Clear out stuff in the info column */
-  if(check_col(pinfo->cinfo,COL_INFO)){
-    col_clear(pinfo->cinfo,COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   if (tree) {
     ti = proto_tree_add_item(tree, proto_rtcfg, tvb, offset, -1, FALSE);

diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 3f84d6210243d7727674998627169976600aa00a..677f35e576279558d65c0f0d9680e4ca3d27589e 100644 (file)
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -5593,9 +5593,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb,
   /* --- Make entries in Protocol column ---*/
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS");
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
 
   if (tree) {

diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c
index c0571abba9122da37bc2b5bed7c218f8329cbcdd..2f624119dd49ff48110c17f4817e67fe68452c85 100644 (file)
--- a/epan/dissectors/packet-rtps2.c
+++ b/epan/dissectors/packet-rtps2.c
@@ -8182,9 +8182,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb,
   /* --- Make entries in Protocol column ---*/
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS2");
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* Check if is NDDSPING */
   {

diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index f2ce069da0a760b0b4b316ee924f47b312cfd286..60204940ca17b4be2ca741a1713ad4992abb4df7 100644 (file)
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -1301,9 +1301,7 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "S5066");
        /* Clear out stuff in the info column, the add PDU type */
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
        if (check_col(pinfo->cinfo, COL_INFO)) {
                col_add_fstr(pinfo->cinfo, COL_INFO, "PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)"));
        }

diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 7bd9a178666d61f00c897227849c7b0731e83d1e..d1f05911bc7edf81aa5158e5e4fe4892fc40c2e6 100644 (file)
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -572,9 +572,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
        guint32 uptime;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        cmd = tvb_get_guint8(tvb, offset);
 
@@ -815,9 +813,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
        guint namelen;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER");
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        cmd = tvb_get_guint8(tvb, offset);
 

diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c
index 25cdfe53481de1f4773aff4a3eeb310669016d3c..94f528d99e062d6837424e64b6b539e2d0064e31 100644 (file)
--- a/epan/dissectors/packet-smb-mailslot.c
+++ b/epan/dissectors/packet-smb-mailslot.c
@@ -107,9 +107,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb,
                return TRUE;
        }
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        smb_info = pinfo->private_data;
        if (smb_info->sip != NULL && smb_info->sip->extra_info_type == SMB_EI_TRI)

diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 05468fc6d6a75f125960a2b296a6f626a7824662..f59d63a565eaf39bd128b8943d69683ffa5b6aaf 100644 (file)
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -16262,9 +16262,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        top_tree=parent_tree;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB");
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* start off using the local variable, we will allocate a new one if we
           need to*/

diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index 32e2e67e57b50b900b8c2b61c85a61295f170d5c..82d4f6c2a17d9b03b1a5aeda2db4ad0ea906d70a 100644 (file)
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -2135,9 +2135,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree)
   gint32 tag;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125");
-  if (check_col(pinfo->cinfo, COL_INFO)){
-    col_clear(pinfo->cinfo, COL_INFO);
-  }
+  col_clear(pinfo->cinfo, COL_INFO);
 
   item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), FALSE);
   tree = proto_item_add_subtree(item, ett_t125);

diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 435d1044380e3ef6ebf659717b26c6017e07b3e3..80a152d60382f218ce71ff8cea537e95493bbd10 100644 (file)
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -1094,9 +1094,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        }
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        primary_part = TRUE;
 
@@ -1141,9 +1139,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint16 ifp_packet_number=1;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        primary_part = TRUE;
 

diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 32cdc65a307f015c6ce143e85b5488474c4c221f..83f6ea3cb2f75bfbd88a01c32df564a1b963568c 100644 (file)
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -708,9 +708,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        conversation_data = ts2_get_conversation(pinfo);
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TS2");
        /* Clear out stuff in the info column */
-       if (check_col(pinfo->cinfo,COL_INFO)) {
-               col_clear(pinfo->cinfo,COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
        if (check_col(pinfo->cinfo, COL_INFO)) 
        {
                if(class==TS2C_ACK)

diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c
index 934acf86e407d6e0f46c6b2a0614e0f1bbef727f..165b9ccd9946af21f1afc963c473a2ecaf06e573 100644 (file)
--- a/epan/dissectors/packet-wccp.c
+++ b/epan/dissectors/packet-wccp.c
@@ -211,9 +211,7 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                return 0;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCCP");
-       if(check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        if(check_col(pinfo->cinfo, COL_INFO)) {

diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index d13e65f83ef5efdc4bdd5b2b2e0fd6adde4f2d66..cbc8cebe602e6558215489539041dbf69be3ce04 100644 (file)
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -642,9 +642,7 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        enum wrepl_mess_type mess_type;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "WINS-Replication");
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (parent_tree) {
                winsrepl_item = proto_tree_add_item(parent_tree, proto_winsrepl, tvb, offset, -1, FALSE);

diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 48595ffc3d83712bc6b50bf4d522302baa0eb7bf..afa077dbff63207d5aa99867d08d9b9472661f89 100644 (file)
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -5469,10 +5469,7 @@ dissect_wsp_fromwap_cl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        /*
         * XXX - what about WTLS->WSP?
         */
-       if (check_col(pinfo->cinfo, COL_INFO))
-       {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
        dissect_wsp_common(tvb, pinfo, tree, wtp_fromudp_handle, TRUE);
 }
 

diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c
index 885aed19d8c753ee264752199ec32f6c8f81f6b3..6ce56d7d05660ca50e66389fc8437e933712605c 100644 (file)
--- a/epan/dissectors/packet-x224.c
+++ b/epan/dissectors/packet-x224.c
@@ -180,9 +180,7 @@ dissect_x224(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        x224_conv_info_t *x224_info;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.224");
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
        length = tvb_get_guint8(tvb, offset);
        if (parent_tree) {

diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index e2041fd51c03af81a99c051cc716b86987dd0e16..d4b2c9a146f6a5acd4f9705d5752d4a0e90660bf 100644 (file)
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -368,9 +368,7 @@ dissect_zbee_nwk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* Add ourself to the protocol column, clear the info column, and create the protocol tree. */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
     if (tree) {
         proto_root = proto_tree_add_protocol_format(tree, proto_zbee_nwk, tvb, offset, tvb_length(tvb), "ZigBee Network Layer");
         nwk_tree = proto_item_add_subtree(proto_root, ett_zbee_nwk);

diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index c749fd194be62bed25f56829676f38db4b83e922..f5a866e829f392282115af7d39569c695352dc7c 100644 (file)
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -558,9 +558,7 @@ static void dissect_zbee_zcl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
     }
 
     /* Clear info column */
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* Get the FCF */
     fcf = tvb_get_guint8(tvb, offset);

diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c
index 8e8c0be533d88b3d5680e437b993791fd72c30e3..b3ce57f1864b273913298031ac3789e2648d9bea 100644 (file)
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/ethercat/packet-ethercat-frame.c
@@ -84,10 +84,7 @@ static void dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECATF");
 
-   if (check_col(pinfo->cinfo, COL_INFO))
-   {
-      col_clear(pinfo->cinfo, COL_INFO);
-   }
+   col_clear(pinfo->cinfo, COL_INFO);
 
    if (tree)
    {

diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c
index 564f49f7f57fec6edca9c244f4e5aa1501e87158..dc8a540d140e3583a508aa89e2c2fb971cebe28d 100644 (file)
--- a/plugins/m2m/packet-m2m.c
+++ b/plugins/m2m/packet-m2m.c
@@ -186,10 +186,7 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax");
 
        /* Clear out stuff in the info column */
-       if (check_col(pinfo->cinfo, COL_INFO))
-       {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        {       /* we are being asked for details */

diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c
index 0486f92492461563aa7fd2e100cc1b5351108aaa..2f03ef73d68575acb7fbeb964850b539afef841c 100644 (file)
--- a/plugins/profinet/packet-pn-mrp.c
+++ b/plugins/profinet/packet-pn-mrp.c
@@ -394,9 +394,7 @@ dissect_PNMRP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-MRP");
                
     /* Clear the information column on summary display */
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     if (tree) 
     {

diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index 1a7799ab86361e97b2f1dc65651c586a50bab118..137e117acb22691e4c027ff59bacac46c7652133 100644 (file)
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -1545,9 +1545,7 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree){
    size=tvb_length_remaining(tvb, offset);
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNISTIM");
       /* Clear out stuff in the info column */
-   if (check_col(pinfo->cinfo,COL_INFO)) {
-         col_clear(pinfo->cinfo,COL_INFO);
-    }
+   col_clear(pinfo->cinfo, COL_INFO);
     ti = proto_tree_add_item(tree,proto_unistim,tvb,offset,-1,FALSE);
     overall_unistim_tree = proto_item_add_subtree(ti,ett_unistim);
     ti1=proto_tree_add_text(overall_unistim_tree,tvb,offset,5,"Reliable UDP");

diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c
index 9beffdf051f0e4d1fcf1707f9f9eaa25fe5fd0d8..9866c8ec4111c769b7d8a3433de0cc4ca952caad 100644 (file)
--- a/plugins/wimax/packet-wmx.c
+++ b/plugins/wimax/packet-wmx.c
@@ -794,10 +794,7 @@ static void dissect_wimax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        /* display the WiMax protocol name */
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax");
        /* Clear out stuff in the info column */
-       if (check_col(pinfo->cinfo, COL_INFO))
-       {
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
+       col_clear(pinfo->cinfo, COL_INFO);
 }
 
 gboolean is_down_link(address *src_address)

diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index 375765eabd08f6a26e029928a8b8a0f183261cd8..cdb56b3a206e36d850785f4b7338c7875d87915a 100644 (file)
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -2004,10 +2004,7 @@ dissect_wimaxasncp(
     /* We'll fill in the "Info" column after fetch data, so we clear the
        column first in case calls to fetch data from the packet throw an
        exception. */
-    if (check_col(pinfo->cinfo, COL_INFO))
-    {
-        col_clear(pinfo->cinfo, COL_INFO);
-    }
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* ========================================================================
      * Disesction starts here