Don't guard col_clear with col_check
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 9 Aug 2009 07:36:13 +0000 (07:36 +0000)
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 9 Aug 2009 07:36:13 +0000 (07:36 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29344 f5534014-38df-0310-8fa8-9805f1628bb7

215 files changed:
asn1/acse/packet-acse-template.c
asn1/cmip/packet-cmip-template.c
asn1/disp/packet-disp-template.c
asn1/dop/packet-dop-template.c
asn1/dsp/packet-dsp-template.c
asn1/ftam/packet-ftam-template.c
asn1/goose/packet-goose-template.c
asn1/kerberos/packet-kerberos-template.c
asn1/mms/packet-mms-template.c
asn1/mpeg-audio/packet-mpeg-audio-template.c
asn1/mpeg-pes/packet-mpeg-pes-template.c
asn1/pres/packet-pres-template.c
asn1/ros/packet-ros-template.c
asn1/rtse/packet-rtse-template.c
asn1/x411/packet-x411-template.c
epan/dissectors/packet-3com-xns.c
epan/dissectors/packet-3g-a11.c
epan/dissectors/packet-9p.c
epan/dissectors/packet-aarp.c
epan/dissectors/packet-acse.c
epan/dissectors/packet-actrace.c
epan/dissectors/packet-airopeek.c
epan/dissectors/packet-ajp13.c
epan/dissectors/packet-aodv.c
epan/dissectors/packet-aoe.c
epan/dissectors/packet-ap1394.c
epan/dissectors/packet-arp.c
epan/dissectors/packet-aruba-adp.c
epan/dissectors/packet-asf.c
epan/dissectors/packet-atalk.c
epan/dissectors/packet-atm.c
epan/dissectors/packet-auto_rp.c
epan/dissectors/packet-bfd.c
epan/dissectors/packet-bgp.c
epan/dissectors/packet-bofl.c
epan/dissectors/packet-brdwlk.c
epan/dissectors/packet-bssgp.c
epan/dissectors/packet-cdp.c
epan/dissectors/packet-chdlc.c
epan/dissectors/packet-cip.c
epan/dissectors/packet-cisco-wids.c
epan/dissectors/packet-clnp.c
epan/dissectors/packet-cmip.c
epan/dissectors/packet-cmpp.c
epan/dissectors/packet-cops.c
epan/dissectors/packet-cpha.c
epan/dissectors/packet-cups.c
epan/dissectors/packet-dccp.c
epan/dissectors/packet-dhcp-failover.c
epan/dissectors/packet-dhcpv6.c
epan/dissectors/packet-disp.c
epan/dissectors/packet-distcc.c
epan/dissectors/packet-dlm3.c
epan/dissectors/packet-dnp.c
epan/dissectors/packet-dns.c
epan/dissectors/packet-dop.c
epan/dissectors/packet-dplay.c
epan/dissectors/packet-dsp.c
epan/dissectors/packet-dtls.c
epan/dissectors/packet-eap.c
epan/dissectors/packet-eapol.c
epan/dissectors/packet-edonkey.c
epan/dissectors/packet-eigrp.c
epan/dissectors/packet-enip.c
epan/dissectors/packet-esis.c
epan/dissectors/packet-fefd.c
epan/dissectors/packet-fr.c
epan/dissectors/packet-ftam.c
epan/dissectors/packet-fw1.c
epan/dissectors/packet-gift.c
epan/dissectors/packet-gnutella.c
epan/dissectors/packet-goose.c
epan/dissectors/packet-gprs-ns.c
epan/dissectors/packet-gtp.c
epan/dissectors/packet-gtpv2.c
epan/dissectors/packet-h223.c
epan/dissectors/packet-hci_h1.c
epan/dissectors/packet-hyperscsi.c
epan/dissectors/packet-iapp.c
epan/dissectors/packet-icp.c
epan/dissectors/packet-idp.c
epan/dissectors/packet-ieee80211.c
epan/dissectors/packet-ieee8021ah.c
epan/dissectors/packet-igrp.c
epan/dissectors/packet-imf.c
epan/dissectors/packet-infiniband.c
epan/dissectors/packet-ipars.c
epan/dissectors/packet-ipsec-tcp.c
epan/dissectors/packet-ipsec-udp.c
epan/dissectors/packet-ipsec.c
epan/dissectors/packet-ipv6.c
epan/dissectors/packet-ipx.c
epan/dissectors/packet-ipxwan.c
epan/dissectors/packet-isakmp.c
epan/dissectors/packet-isis.c
epan/dissectors/packet-isl.c
epan/dissectors/packet-isns.c
epan/dissectors/packet-juniper.c
epan/dissectors/packet-kerberos.c
epan/dissectors/packet-kerberos4.c
epan/dissectors/packet-kpasswd.c
epan/dissectors/packet-l2tp.c
epan/dissectors/packet-lapb.c
epan/dissectors/packet-lapbether.c
epan/dissectors/packet-lapd.c
epan/dissectors/packet-ldp.c
epan/dissectors/packet-linx.c
epan/dissectors/packet-lmi.c
epan/dissectors/packet-lmp.c
epan/dissectors/packet-loop.c
epan/dissectors/packet-lpd.c
epan/dissectors/packet-lsc.c
epan/dissectors/packet-maccontrol.c
epan/dissectors/packet-mbtcp.c
epan/dissectors/packet-mdshdr.c
epan/dissectors/packet-mgcp.c
epan/dissectors/packet-mip.c
epan/dissectors/packet-mip6.c
epan/dissectors/packet-mms.c
epan/dissectors/packet-mpeg-audio.c
epan/dissectors/packet-mpeg-pes.c
epan/dissectors/packet-mq-pcf.c
epan/dissectors/packet-msproxy.c
epan/dissectors/packet-nbipx.c
epan/dissectors/packet-nbns.c
epan/dissectors/packet-ncp.c
epan/dissectors/packet-ndps.c
epan/dissectors/packet-netflow.c
epan/dissectors/packet-nlsp.c
epan/dissectors/packet-nsip.c
epan/dissectors/packet-nt-tpcp.c
epan/dissectors/packet-ntp.c
epan/dissectors/packet-olsr.c
epan/dissectors/packet-ospf.c
epan/dissectors/packet-paltalk.c
epan/dissectors/packet-pcep.c
epan/dissectors/packet-pim.c
epan/dissectors/packet-ppi.c
epan/dissectors/packet-ppp.c
epan/dissectors/packet-pptp.c
epan/dissectors/packet-pres.c
epan/dissectors/packet-pvfs2.c
epan/dissectors/packet-qllc.c
epan/dissectors/packet-quake.c
epan/dissectors/packet-radius.c
epan/dissectors/packet-rdm.c
epan/dissectors/packet-rip.c
epan/dissectors/packet-ripng.c
epan/dissectors/packet-rmt-alc.c
epan/dissectors/packet-rmt-norm.c
epan/dissectors/packet-ros.c
epan/dissectors/packet-rpcap.c
epan/dissectors/packet-rsl.c
epan/dissectors/packet-rsvp.c
epan/dissectors/packet-rsync.c
epan/dissectors/packet-rtmpt.c
epan/dissectors/packet-rtp-events.c
epan/dissectors/packet-rtse.c
epan/dissectors/packet-rudp.c
epan/dissectors/packet-rx.c
epan/dissectors/packet-sap.c
epan/dissectors/packet-sbus.c
epan/dissectors/packet-sdlc.c
epan/dissectors/packet-ses.c
epan/dissectors/packet-sigcomp.c
epan/dissectors/packet-sita.c
epan/dissectors/packet-sll.c
epan/dissectors/packet-smb-logon.c
epan/dissectors/packet-sna.c
epan/dissectors/packet-sndcp.c
epan/dissectors/packet-sqloracle.c
epan/dissectors/packet-srvloc.c
epan/dissectors/packet-ssl.c
epan/dissectors/packet-sua.c
epan/dissectors/packet-syslog.c
epan/dissectors/packet-tacacs.c
epan/dissectors/packet-tcp.c
epan/dissectors/packet-teimanagement.c
epan/dissectors/packet-telkonet.c
epan/dissectors/packet-teredo.c
epan/dissectors/packet-tipc.c
epan/dissectors/packet-tn3270.c
epan/dissectors/packet-trmac.c
epan/dissectors/packet-tsp.c
epan/dissectors/packet-tzsp.c
epan/dissectors/packet-udld.c
epan/dissectors/packet-uma.c
epan/dissectors/packet-usb-masstorage.c
epan/dissectors/packet-v120.c
epan/dissectors/packet-vicp.c
epan/dissectors/packet-vines.c
epan/dissectors/packet-vlan.c
epan/dissectors/packet-vnc.c
epan/dissectors/packet-vrrp.c
epan/dissectors/packet-wcp.c
epan/dissectors/packet-wfleet-hdlc.c
epan/dissectors/packet-who.c
epan/dissectors/packet-wol.c
epan/dissectors/packet-wow.c
epan/dissectors/packet-wsp.c
epan/dissectors/packet-wtp.c
epan/dissectors/packet-x29.c
epan/dissectors/packet-x411.c
epan/dissectors/packet-xcsl.c
epan/dissectors/packet-xdmcp.c
epan/dissectors/packet-xtp.c
plugins/asn1/packet-asn1.c
plugins/docsis/packet-macmgmt.c
plugins/ethercat/packet-ams.c
plugins/ethercat/packet-ethercat-datagram.c
plugins/ethercat/packet-ioraw.c
plugins/ethercat/packet-nv.c
plugins/gryphon/packet-gryphon.c
plugins/irda/packet-irda.c
plugins/sercosiii/packet-sercosiii_1v1.c

index 2634cffbb7e1ad278bba262b263da1fa0a7a5ce3..e87920161cfdd11ac0b061a1f5314fd817226710 100644 (file)
@@ -223,8 +223,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_acse);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        /*  we can't make any additional checking here   */
index 8876f3e0120611f40965b0fd3c08a892f26a7354..88b292e092a1fedbbd0f63e3bfd3ba46e30deed9 100644 (file)
@@ -129,8 +129,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        }
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        switch(session->spdu_type){
                case SES_CONNECTION_REQUEST:
                case SES_CONNECTION_ACCEPT:
index d579487858e8eb1ff3889e25954a31b8137a3f10..f233cd10eb6837c4bbe56d3fbb93fe00aeca8c11 100644 (file)
@@ -108,8 +108,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_disp);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch(session->ros_op & ROS_OP_MASK) {
        case (ROS_OP_BIND | ROS_OP_ARGUMENT):   /*  BindInvoke */
index 8547281b6b19151683c53811b1b0ca5020f13c03..ca572d861751e1a8b541f73e966f2ae3bb0760ad 100644 (file)
@@ -149,8 +149,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_dop);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch(session->ros_op & ROS_OP_MASK) {
        case (ROS_OP_BIND | ROS_OP_ARGUMENT):   /*  BindInvoke */
index 14ad8453f131d44cdc4a724389bed16c8cbf1c6a..cc713219da5cdd6370b7ac7bb5b8d42e80e1ce94 100644 (file)
@@ -102,8 +102,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_dsp);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch(session->ros_op & ROS_OP_MASK) {
        case (ROS_OP_BIND | ROS_OP_ARGUMENT):   /*  BindInvoke */
index f6985656c076642695935def47a59676dfbd5775..49d31393515a3ae2650eae1a293064e3bf52af45 100644 (file)
@@ -102,8 +102,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_ftam);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        while (tvb_reported_length_remaining(tvb, offset) > 0){
                old_offset=offset;
index d081e667bf604ec2d15cc1d7f546017f2fcc19ec..10e31a6b1ce4afa08e4213bd195ac960945a4d20 100644 (file)
@@ -78,8 +78,7 @@ dissect_goose(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        }
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
                col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* APPID */
        if (tree && tvb_reported_length_remaining(tvb, offset) >= 2) {
index b53838c32e3951bbdf1fd93b71ab3e7c5256d4c9..2d3cc0f7c55d0eb5b7ffe0533370574b77c4e2fc 100644 (file)
@@ -1418,8 +1418,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
        }
        if (do_col_info) {
-            if (check_col(pinfo->cinfo, COL_INFO))
-                col_clear(pinfo->cinfo, COL_INFO);
+            col_clear(pinfo->cinfo, COL_INFO);
         }
         if (tree) {
             item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE);
index 49286e3d12e77a0a56f3da965a52b8888c1e8b80..5740fb5275cdaef2c6d1b249ef2cddce30ee4ce5 100644 (file)
@@ -71,8 +71,7 @@ dissect_mms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_mms);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        while (tvb_reported_length_remaining(tvb, offset) > 0){
                old_offset=offset;
index 7c0c115ae1deab88e177fd07761bb4f9948418bf..07ddf3fdc26d4cb1854f989be0d64aa4db871d45 100644 (file)
@@ -121,8 +121,7 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        asn1_ctx_t asn1_ctx;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        if (tree == NULL)
                return;
        asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
@@ -134,8 +133,7 @@ static void
 dissect_id3v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        proto_tree_add_item(tree, hf_id3v2, tvb,
                        0, -1, FALSE);
 }
index 23271106fc9d25d8b695e07bb1f62b65aaceb574..714adadf11be5d707f99760f0e15d1a16c70452f 100644 (file)
@@ -311,8 +311,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        if (prefix != PES_PREFIX)
                return FALSE;
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        stream = tvb_get_guint8(tvb, 3);
        if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -466,8 +465,7 @@ dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG");
-       if (check_col(pinfo->cinfo, COL_INFO))
-           col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        if (tree)
            proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, FALSE);
     }
index a6fa4323330eb15f13fb083a93936aa85491865d..01a6035df98f065a528d2374db9db5b65a6e00f6 100644 (file)
@@ -315,8 +315,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        /*  postpone it before dissector will have more information */
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRES");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        /* save pointers for calling the acse dissector  */
        global_tree = parent_tree;
        global_pinfo = pinfo;
index 3b8c3d24ead788dddb23861f33d06a23144c4a97..244e373f22d49f1910fc34340a07a65263cb4e12 100644 (file)
@@ -443,8 +443,7 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_ros);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        while (tvb_reported_length_remaining(tvb, offset) > 0){
                old_offset=offset;
index 23b9205c4e175c3fba403dee2e3c44cf21435be0..85695ae33646583f37559c31f54fe4ac2a8c8d6d 100644 (file)
@@ -217,8 +217,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        }
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSE");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (rtse_reassemble && 
            ((session->spdu_type == SES_DATA_TRANSFER) ||
index ea38831c0af7715e38149ff21fddbd9b549ff881..3f70f0cd063d31c9247f24ded31759da88cd74a7 100644 (file)
@@ -181,8 +181,7 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_x411);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch(session->ros_op & ROS_OP_MASK) {
        case (ROS_OP_BIND | ROS_OP_ARGUMENT):   /*  BindInvoke */
index bcc2221afac77fd48ed8ec64fee69c9b8baf42cf..a105b1924482113b2f075e43df8bedabda83ebcd 100644 (file)
@@ -71,8 +71,7 @@ dissect_3com_xns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "3Com XNS");
-       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_3com_xns, tvb, 0, 4, FALSE);
index 6a9a6fd832af8c536fa195e2132d0cc1b968f1c7..3c7cee0568423dd050c99f4b435b413f70fe11ba 100644 (file)
@@ -1394,8 +1394,7 @@ dissect_a11( 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, "3GPP2 A11");
-  if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   switch (type) {
   case REGISTRATION_REQUEST:
index 0a46abb1aa9c5f1e040c7b706c71820f6672b855..74636ddb0bc215f6755d388555ce3bfd05b01332 100644 (file)
@@ -220,8 +220,7 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
        nstime_t tv;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "9P");
-       if (check_col(pinfo->cinfo, COL_INFO)) 
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        ninesz = tvb_get_letohl(tvb, offset);
        ninemsg = tvb_get_guint8(tvb, offset + 4);
index 63f9534177f9a1a0907a1721fb57bdbadad4d92f..815a3d8ebc78579b50a670601b5da987cb51802e 100644 (file)
@@ -156,8 +156,7 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   gchar       *sha_str, *spa_str, *tha_str, *tpa_str;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "AARP");
-  if(check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   ar_hrd = tvb_get_ntohs(tvb, AR_HRD);
   ar_pro = tvb_get_ntohs(tvb, AR_PRO);
index 8a5fc63f21bafebd8ca8606c8afe898a6a2d4084..e31914aad890f3be6ffa981b5bdca07228b494bc 100644 (file)
@@ -1726,8 +1726,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_acse);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        /*  we can't make any additional checking here   */
index 9ac42bd4abbbcfb48deb371b6dc87087a49166db..1ee3dd81ed7fe44737f1ef7de9698d0a92e8ec59 100644 (file)
@@ -468,8 +468,7 @@ static int dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 * an exception.  We can set them later as well....
                 */
                col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_TRACE");
-               if (check_col(pinfo->cinfo, COL_INFO))
-                       col_clear(pinfo->cinfo, COL_INFO);
+               col_clear(pinfo->cinfo, COL_INFO);
 
                if (tree)
                {
index dace13dcda2c50925f64227fbe5b2eceb3bd337c..aa14e2066b9f7481bcd8cd1e03d41d253f879fb5 100644 (file)
@@ -64,8 +64,7 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_item *ti = NULL;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIROPEEK");
-  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_airopeek, tvb, 0, -1, FALSE);
index 42b06ccc033c9bb57b41b6cb348d952fab793227..3fe64a459d82dc764ab6102d73be073de609af82 100644 (file)
@@ -701,8 +701,7 @@ dissect_ajp13_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
   }
 
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   mag = tvb_get_ntohs(tvb, 0);
   len = tvb_get_ntohs(tvb, 2);
index 0f921e95819beb6a93c9d0047e3cfe575e50a9d7..1197b977ba7bea1b208f7ca856c8a61b6fe1a15c 100644 (file)
@@ -772,8 +772,7 @@ dissect_aodv(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, "AODV");
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* Is this running over IPv6? */
     is_ipv6 = (pinfo->src.type == AT_IPv6);
index 06543f5f00b376df869a017d5e611f978e5214b0..18681f3fd7b139dd9ec5e71f477ce6fa59523df0 100644 (file)
@@ -400,8 +400,7 @@ dissect_aoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
   guint8 version;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "AoE");
-  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_aoe, tvb, 0, -1, FALSE);
index 5a8412acdccaa3ea8dc07ac37aa531d4e7d86a31..753d67af51371eb1c4cb828b5d5bc26a183e9c0d 100644 (file)
@@ -73,8 +73,7 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tvbuff_t *next_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/IEEE1394");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   src_addr=tvb_get_ptr(tvb, 8, 8);
   SET_ADDRESS(&pinfo->dl_src,  AT_EUI64, 8, src_addr);
index 6b6eb1752930c8fc5c9c034cc8b972afaa1eb40a..5723c1a51e0d5005473c50fc02f3133cd0a4a680 100644 (file)
@@ -874,8 +874,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
      Clear the Info column so that, if we throw an exception, it
      shows up as a short or malformed ARP frame. */
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ARP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* Hardware Address Type */
   ar_hrd = tvb_get_ntohs(tvb, AR_HRD);
index 78a360a725d2882dd32d0f086383464fefc839a3..eff14b8726f91038cb1faccc2ed1f39e9f3a8183 100644 (file)
@@ -65,8 +65,7 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ADP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
 
   if (tree) {
index d478f0bafc234f35153e53e9716734244e855e2c..726ae0f5c3dad0883c684cd3dca130769faa6ab7 100644 (file)
@@ -83,8 +83,7 @@ dissect_asf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASF");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        type = tvb_get_guint8(tvb, 4);
        len = tvb_get_guint8(tvb, 7);
index 3535e6404b481d038435fb0e6312bcd7b67cfc2f..7e51052cfe03dc515cbee58da6f4161423bf8711 100644 (file)
@@ -580,8 +580,7 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   guint8 function;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   function = tvb_get_guint8(tvb, 0);
 
@@ -608,8 +607,7 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   int i;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   net = tvb_get_ntohs(tvb, offset);
   nodelen_bits = tvb_get_guint8(tvb, offset+2);
@@ -694,8 +692,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   guint i;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   info = tvb_get_guint8(tvb, offset);
   op = info >> 4;
@@ -1196,8 +1193,7 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int len;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "PAP");
-  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_pap, tvb, offset, -1, FALSE);
@@ -1329,8 +1325,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int len;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   aspinfo = get_transaction(tvb, pinfo);
   if (!aspinfo)
@@ -1476,8 +1471,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint8 len;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   aspinfo = get_transaction(tvb, pinfo);
   if (!aspinfo)
@@ -1556,8 +1550,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint count;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   fn = tvb_get_guint8(tvb, 0);
   if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -1683,8 +1676,7 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode,
   tvbuff_t   *new_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP");
-  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_ddp, tvb, 0, DDP_SHORT_HEADER_SIZE,
@@ -1745,8 +1737,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tvbuff_t   *new_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   tvb_memcpy(tvb, (guint8 *)&ddp, 0, sizeof(e_ddp));
   ddp.dnet=g_ntohs(ddp.dnet);
@@ -1839,8 +1830,7 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tvbuff_t   *new_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLAP");
-  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_llap, tvb, 0, 3, FALSE);
index 181f80b5bb79e50a73dba04538d8a367983fe599..26885ba7b85dfeb72fb054bf312d47811fa58c65 100644 (file)
@@ -1675,8 +1675,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
   case AAL_1:
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1");
-    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_aal1, tvb, offset, -1, FALSE);
     aal_tree = proto_item_add_subtree(ti, ett_aal1);
     octet = tvb_get_guint8(tvb, offset);
@@ -1701,8 +1700,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
      * XXX - or should this be the CS PDU?
      */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4");
-    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_aal3_4, tvb, offset, -1, FALSE);
     aal_tree = proto_item_add_subtree(ti, ett_aal3_4);
     aal3_4_hdr = tvb_get_ntohs(tvb, offset);
@@ -1737,8 +1735,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     if (NULL == pwpd || pwpd->enable_fill_columns_by_atm_dissector)
     {
       col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL");
-      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_oamaal, tvb, offset, -1, FALSE);
     aal_tree = proto_item_add_subtree(ti, ett_oamaal);
index 12cf1e12c27900087ed99c60528dbd39a040b882..d61bdb77bb0c84efb2185c6e3bbecbf7b8c8c783 100644 (file)
@@ -116,8 +116,7 @@ static void dissect_auto_rp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         guint8 ver_type, rp_count;
 
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "Auto-RP");
-        if (check_col(pinfo->cinfo, COL_INFO))
-                col_clear(pinfo->cinfo, COL_INFO);
+        col_clear(pinfo->cinfo, COL_INFO);
 
         ver_type = tvb_get_guint8(tvb, 0);
         rp_count = tvb_get_guint8(tvb, 1);
index 899c418d107bae962a2ce3f689572777e68bc4be..2e8d932f646a0325ae3f5d88acd6137aca58736a 100644 (file)
@@ -366,8 +366,7 @@ static void dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
     const char *sep;
     
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "BFD Control");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     bfd_version = ((tvb_get_guint8(tvb, 0) & 0xe0) >> 5);
     bfd_diag = (tvb_get_guint8(tvb, 0) & 0x1f);
index 955cdd3522fa1acda55fde0c8603083ed76930da..ec49481ef0dd24e602e0138026994d4106f6495b 100644 (file)
@@ -2830,8 +2830,7 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     tvbuff_t *volatile next_tvb;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "BGP");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /*
      * Scan through the TCP payload looking for a BGP marker.
index 1bc34124812c08ee8c89fe00dfee738f488e07d7..8e392aee81a27eaead4a847bcf1d1e1309ad6e7a 100644 (file)
@@ -70,8 +70,7 @@ dissect_bofl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "BOFL");
 
-    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_bofl, tvb, 0, -1, FALSE);
index ed28d40bd182e0eb0cee7b4e5343d8cd973f8e77..02fa429fa1da28def4c94a23be535272919d38e5 100644 (file)
@@ -235,8 +235,7 @@ dissect_brdwlk (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, "Boardwalk");
     
-    if (check_col(pinfo->cinfo, COL_INFO)) 
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     pinfo->vsan = (tvb_get_ntohs (tvb, offset) & 0xFFF);
     sof = (tvb_get_guint8 (tvb, offset) & 0xF0) >> 4;
index bf88e178c0522729c6d5743e2298affeb36b50ef..1f3d439946f61e618ccf659d90db86d1cf515df1 100644 (file)
@@ -5997,8 +5997,7 @@ dissect_bssgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "BSSGP");
 
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   bi.pdutype = tvb_get_guint8(tvb, 0);
   bi.offset++;
index f61c8cec792bfc88bd7050a6fc6306e5c3aca5d0..65538df130ce41173ccb694e1899406862eca98d 100644 (file)
@@ -185,8 +185,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     vec_t cksum_vec[1];
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "CDP");
-    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_cdp, tvb, offset, -1, FALSE);
index c4cfdedf8959fb147deeae9412ce1653ad59aea7..6991f02cc04dfaf40b0f63f4d79a5df2afb42672 100644 (file)
@@ -164,8 +164,7 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint16    proto;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CHDLC");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   switch (pinfo->p2p_dir) {
 
@@ -272,8 +271,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint32 yoursequence;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLARP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   code = tvb_get_ntohl(tvb, 0);
 
index 15e18a084b29e4ce86b678be016aebb1de55628b..cfaeed7ec2473fc1d7a9ae96107145047c84dd35 100644 (file)
@@ -2757,8 +2757,7 @@ dissect_cip(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, "CIP");
 
-   if (check_col( pinfo->cinfo, COL_INFO ) )
-      col_clear( pinfo->cinfo, COL_INFO );
+   col_clear(pinfo->cinfo, COL_INFO);
 
    /* Each CIP request received by ENIP gets a unique ID */
    enip_info = (enip_request_info_t*)p_get_proto_data(pinfo->fd, proto_enip);
index ddebf5272bf4626bb2c8834acfc1974b443c4d7f..80e106941aa59223dad1a11583e878a1f90420af 100644 (file)
@@ -80,8 +80,7 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint remain;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CWIDS");
-       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_set_str(pinfo->cinfo, COL_INFO, "Cwids: ");
index a8f17dc59fb4dfd38c63665ffa22f57b6969d3e0..a57de95464bc8c2708ddc358e6d1f25b58fe8fb3 100644 (file)
@@ -218,8 +218,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   gboolean    save_fragmented;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLNP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   cnf_proto_id = tvb_get_guint8(tvb, P_CLNP_PROTO_ID);
   if (cnf_proto_id == NLPID_NULL) {
index 61c4fad662076475464f1ea9f1251329593fc163..147575f2d0bdcddc83e4fdf9014476c94bc1070d 100644 (file)
@@ -4425,8 +4425,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        }
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        switch(session->spdu_type){
                case SES_CONNECTION_REQUEST:
                case SES_CONNECTION_ACCEPT:
index 042b25214c454a1da49ac134ef785d4ee3a25a5c..b61b1b9d8e33a1115761ba36275b29994668da4e 100644 (file)
@@ -659,8 +659,7 @@ dissect_cmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        if (match_strval(command_id, vals_command_Id) == NULL)
                return 0;
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        tcp_dissect_pdus(tvb, pinfo, tree, cmpp_desegment, CMPP_FIX_HEADER_LENGTH,
                         get_cmpp_pdu_len, dissect_cmpp_tcp_pdu);
index 92392be88850107e441284f22ef2adbab9c2de0c..dd7ea976abc09a02c5c27807559d658a3993fa03 100644 (file)
@@ -897,8 +897,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int object_len;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "COPS");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   op_code = tvb_get_guint8(tvb, 1);
   if (check_col(pinfo->cinfo, COL_INFO))
index 58d904feb091f83c605307e182a08aa6820cbb0a..88009c55616f5b4798deec73ac4944a1a02f1d15 100644 (file)
@@ -219,8 +219,7 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   }
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CPHA");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr));
   hdr.magic_number = g_ntohs(hdr.magic_number);
index b11c7ba04d4d3a5a44264b81298a446e0c499a03..d471123100e9413b0087493e5f7a82b67f33a461 100644 (file)
@@ -162,8 +162,7 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
                col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_CUPS);
-       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_cups, tvb, offset, -1,
index b4c67b0a3bdc0671ebb2a1de3240545036409f35..ca878d92692f591cea7e3d7027a12bad1da2b79d 100644 (file)
@@ -597,8 +597,7 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        SET_ADDRESS(&dccph->ip_dst, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data);
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCCP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
         /* Extract generic header */
        dccph->sport=tvb_get_ntohs(tvb, offset);
index a45baca429ad0ae70cbe6ca5bf987e1e8320aed3..2caccc1d004ba4fbfaee846abc2df8432f127a21 100644 (file)
@@ -378,8 +378,7 @@ dissect_dhcpfo_pdu(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, "DHCPFO");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        length = tvb_get_ntohs(tvb, offset);
        if (tree) {
index 98900be34c408c96254e134ef3177b004e95caa6..38d2ac86646215ba30b6ef5bfd6a7f4ee10a20b0 100644 (file)
@@ -1259,8 +1259,7 @@ static void
 dissect_dhcpv6_downstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPv6");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        dissect_dhcpv6(tvb, pinfo, tree, TRUE, 0, tvb_reported_length(tvb));
 }
 
@@ -1268,8 +1267,7 @@ static void
 dissect_dhcpv6_upstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPv6");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        dissect_dhcpv6(tvb, pinfo, tree, FALSE, 0, tvb_reported_length(tvb));
 }
 
index b68e5480ca81fb9639955da9a1f0720e0dd487e8..25ec6d1e7396c11518ae994a275eb88487ecf4c0 100644 (file)
@@ -1549,8 +1549,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_disp);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch(session->ros_op & ROS_OP_MASK) {
        case (ROS_OP_BIND | ROS_OP_ARGUMENT):   /*  BindInvoke */
index d166ad7afcdb31ee5c2b449af3dbef971bf38799..8146ef15a844453bc698599421aa263d9f8ace2b 100644 (file)
@@ -295,8 +295,7 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISTCC ");
 
-       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_distcc, tvb, offset,
index f3c8ae98ece201ffc00dde4c3eb88a07136fc613..9c6b584a0d1186c19c74e68c65314783939585db 100644 (file)
@@ -779,8 +779,7 @@ dissect_dlm3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLM3");
 
 
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
   col_set_str(pinfo->cinfo, COL_INFO, "DLM3");
 
   if (check_col(pinfo->cinfo, COL_INFO))
index 4a4f761c8cb4e35c0ed5b0fc7d8d421d784db9f7..a15e6439f991747df8bfcd746da1640e13216def 100644 (file)
@@ -2317,8 +2317,7 @@ dissect_dnp3_message(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, "DNP 3.0");
 
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* Skip "0x0564" header bytes */
   temp_offset += 2;
@@ -2575,8 +2574,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         /* No reassembly required */
         next_tvb = al_tvb;
         add_new_data_source(pinfo, next_tvb, "DNP 3.0 Application Layer message");
-        if (check_col (pinfo->cinfo, COL_INFO))
-          col_clear (pinfo->cinfo, COL_INFO);
+        col_clear(pinfo->cinfo, COL_INFO);
       }
       pinfo->fragmented = save_fragmented;
     }
index 18b1ccc7a02864d24bcae36b0c9f379c249c3a18..fe02348806ae14ff015e15e547d07e7bab856596 100644 (file)
@@ -2769,8 +2769,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
   dns_data_offset = offset;
 
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
 #define MAX_BUF_SIZE (128+1)
   buf=ep_alloc(MAX_BUF_SIZE);
index 1fdb2d79c9d0702c64444cc499511ff3379f2fa3..39efd671022213ccd21f6a802eab157b0de80475 100644 (file)
@@ -2111,8 +2111,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_dop);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch(session->ros_op & ROS_OP_MASK) {
        case (ROS_OP_BIND | ROS_OP_ARGUMENT):   /*  BindInvoke */
index 342eca720b4c3fdc4b455ff1d0fbc83a34e7584f..7193d31ba21e35392a87147f9248f5979676481d 100644 (file)
@@ -1026,8 +1026,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))
             col_add_fstr(pinfo->cinfo,COL_INFO, "DPlay data packet");
         return;
@@ -1143,8 +1142,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
     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))
         col_add_fstr(pinfo->cinfo,COL_INFO, "DPlay player to player message");
 
index d71b1cc159d041a2726a65c5fb8ae603daa3eb47..5f4233d3a5f343addb182eba91c9d3288541cb43 100644 (file)
@@ -1765,8 +1765,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_dsp);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch(session->ros_op & ROS_OP_MASK) {
        case (ROS_OP_BIND | ROS_OP_ARGUMENT):   /*  BindInvoke */
index c53ab89f36962d21f7bbbfd46f8db89040b60fe7..f07e568e1aabe64f5799a403326b2a8f0a90d58e 100644 (file)
@@ -404,8 +404,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 
   /* clear the the info column */
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* Create display subtree for SSL as a whole */
   if (tree)
index 96723f6478ca63e835d4c955efd405e97858eefc..35b592abd81791c6f22d2cc84d9824cef2c75d0b 100644 (file)
@@ -622,8 +622,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_tree *eap_tree = NULL;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   eap_code = tvb_get_guint8(tvb, 0);
 
index f14c873e7b2c1ac6d1af6eea9c13bc71932efe97..e104c5f3900a6584c2e78c1d7e4ad011d72651a5 100644 (file)
@@ -143,8 +143,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tvbuff_t   *next_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPOL");
-  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_eapol, tvb, 0, -1, FALSE);
index f99eeaec117a7f0ea0d21c61a6836cda2d561090..7e9feeb485d387ea7eb3516025e151658bcdcadc 100644 (file)
@@ -3101,8 +3101,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 
 static void dissect_edonkey_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     tcp_dissect_pdus(tvb, pinfo, tree, edonkey_desegment,
                      EDONKEY_TCP_HEADER_LENGTH, get_edonkey_tcp_pdu_len,
index 573c073e70aab377fcb5865d728d3a97655d8ade..f62f78a5044f4a5f242e92db2e116e573d3e83ed 100644 (file)
@@ -148,8 +148,7 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   guint32 ack, size, offset = EIGRP_HEADER_LENGTH;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "EIGRP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   opcode_tmp=opcode=tvb_get_guint8(tvb,1);
   ack = tvb_get_ntohl(tvb,12);
index 3636f40f039a75dfafeb02c01669be9ea1195f1a..f1ee3963d1c331713de4ffdd8a74db210118fd02 100644 (file)
@@ -1028,8 +1028,7 @@ dissect_enip_pdu(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, "ENIP");
-   if (check_col(pinfo->cinfo, COL_INFO))
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
    encap_cmd = tvb_get_letohs( tvb, 0 );
 
@@ -1291,8 +1290,7 @@ dissect_dlr(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, "DLR");
 
-   if (check_col( pinfo->cinfo, COL_INFO ) )
-      col_clear( pinfo->cinfo, COL_INFO );
+   col_clear(pinfo->cinfo, COL_INFO);
 
    if( tree )
    {
index c07dbfaedfcff6a78b2f22863346da1baa24749a..dd409abe155f7342e7fd42201a57bf858dff4cf2 100644 (file)
@@ -283,8 +283,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
    const char *cksum_status;
 
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS");
-   if (check_col(pinfo->cinfo, COL_INFO))
-     col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
    tvb_memcpy(tvb, (guint8 *)&ehdr, 0, sizeof ehdr);
 
index e3b254bc6bbc96c39d6b34a554a6d8c3ae94e5a4..a96b809fbce9b2b2aa8b636eadfaa32a1dd04628 100644 (file)
@@ -106,8 +106,7 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     int real_length;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "FEFD");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     if (tree) {
        proto_item *flags_ti;
index de5326307b121d67232dbddba332f808feb9533b..95f1437d0ab24500d239c76665cf575747502962 100644 (file)
@@ -412,8 +412,7 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   tvbuff_t *next_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR");
-  if (check_col(pinfo->cinfo, COL_INFO))
-      col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   if (has_direction) {
     if (pinfo->pseudo_header->x25.flags & FROM_DCE) {
@@ -670,8 +669,7 @@ static void dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo,
   proto_tree *fr_tree = NULL;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR");
-  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_protocol_format(tree, proto_fr, tvb, 0, -1, "Frame Relay");
index 08ff47db03d5b22d85c00fc80484959c1cf42d31..fb14b38fb2c81b0bb508687f4dc622777fdf363a 100644 (file)
@@ -4795,8 +4795,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_ftam);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        while (tvb_reported_length_remaining(tvb, offset) > 0){
                old_offset=offset;
index 5bc712fa94ebece6b22aca93278ee576e7749ceb..72d7baa67ea9020ed861df29f1adb7e0781e16d6 100644 (file)
@@ -148,8 +148,7 @@ dissect_fw1(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, "FW1");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
 
   /* g_snprintf(header, sizeof(header), fw1_header); */
index 747ac24db37dbf95bad0a5b4d04599161c03e9ac..f099fe8258be6312d540a2adb820be6b78667dee 100644 (file)
@@ -71,8 +71,7 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        line = tvb_get_ptr(tvb, offset, linelen);
 
        /* clear the "Info" column */
-       if (check_col(pinfo->cinfo, COL_INFO)) 
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* set "Info" column text */
        if (check_col(pinfo->cinfo, COL_INFO)) 
index bb21e1f7fa644f15485cd2a9e20c6982f4c57553..3ba14f13594b0acf7076cb660eab1f8111dc5551 100644 (file)
@@ -526,8 +526,7 @@ static void dissect_gnutella(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gnutella");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /*
         * OK, do we have enough data to determine whether this
index c8e6214c5d5c5bca27803611664cb8b7f448e0c6..f6ece0b3ade2fe2a6e7f0d8742c16682324c6f9c 100644 (file)
@@ -666,8 +666,7 @@ dissect_goose(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        }
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
                col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* APPID */
        if (tree && tvb_reported_length_remaining(tvb, offset) >= 2) {
index fe35516dcc320ac06e8f084a3950df12d118d427..2e960f20f129b254621acdcd543eb4050461c8a8 100644 (file)
@@ -261,8 +261,7 @@ dissect_gprs_ns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t *next_tvb;
   
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "GPRS NS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        nspdu = tvb_get_guint8(tvb,offset);
        if (check_col(pinfo->cinfo, COL_INFO)) {
index c5585c833d38c66be83853b7c2987340aa49febf..9097fc52bd283ea51d8088c20b76de5e98e471bf 100644 (file)
@@ -6294,8 +6294,7 @@ static void dissect_gtp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
        }
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP");
-    if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /*
      * Do we have a conversation for this connection?
index 54fdf313d60cb80167278a7f77317a58ff54a2bd..8208006c5dcfeaed7663901b62136ed0ec890033 100644 (file)
@@ -1937,8 +1937,7 @@ dissect_gtpv2(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
        /* Currently we get called from the GTP dissector no need to check the version */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTPv2");
-    if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
        /* message type is in octet 2 */
        message_type = tvb_get_guint8(tvb,1);
index 1e85f1e45ffaa7e0a75313bde60dcbc02d3f1f93..52102857549f82fa224aaf975cce7977212ca4f4 100644 (file)
@@ -1273,8 +1273,7 @@ static void dissect_h223 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree
     if (check_col (pinfo->cinfo, COL_PROTOCOL))
        col_set_str (pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_H223);
 
-    if (check_col (pinfo->cinfo, COL_INFO))
-       col_clear (pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* find or create the call_info for this call */
     call_info = find_or_create_call_info(pinfo);
index 2b8192f0dd8f50aa1658af9f05051271733bfcc5..73b92d1f2e8488a1d82e87e42ca445282434d658 100644 (file)
@@ -64,8 +64,7 @@ dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI");
 
-       if(check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        type = pinfo->pseudo_header->bthci.channel;
 
index 6f05e0125280f572e6f520a43d548b18a28619ac..d4dc738e68eea9d9a50cd8023dac8cae8363946a 100644 (file)
@@ -94,8 +94,7 @@ dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint8     hs_cmd, hs_ver;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "HyperSCSI");
-  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_hyperscsi, tvb, offset, -1, FALSE);
index cc7e4a3fe6b0630fecb112e3400a17f61185a026..1531ca194d44302a85a445c117ae8f54f2743e45 100644 (file)
@@ -419,8 +419,7 @@ dissect_iapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAPP");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        tvb_memcpy(tvb, (guint8 *)&ih, 0, sizeof(e_iapphdr));
 
index 5187254bdc11488193395aa831a0279469d93b3b..94fb84c549b9785151db8cc4d9352ba50552308a 100644 (file)
@@ -153,8 +153,7 @@ static void dissect_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint32 option_data;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   opcode=tvb_get_guint8(tvb, 0);
   message_length=tvb_get_ntohs(tvb, 2);
index d70f4d044a13ea4634eb140541602e2f732e1148..a004e3464611641b831e6809aa9d72240f5f7e99 100644 (file)
@@ -87,11 +87,9 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t        *next_tvb;
        
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP");
-       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_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (tree) {
                ti = proto_tree_add_item(tree, proto_idp, tvb, 0, IDP_HEADER_LEN, FALSE);
index 7bfb0caad50dfed01c5268ca251e4570b86d7262..6540c995d27b643f59d34aefbe699c049db21f53 100644 (file)
@@ -6121,8 +6121,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
   whdr= &whdrs[0];
 
   col_set_str (pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11");
-  if (check_col (pinfo->cinfo, COL_INFO))
-    col_clear (pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   fcf = FETCH_FCF(0);
   frame_type_subtype = COMPOSE_FRAME_TYPE(fcf);
@@ -7553,8 +7552,7 @@ dissect_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   proto_tree *radio_tree = NULL;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Radio");
-  if (check_col(pinfo->cinfo, COL_INFO))
-      col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* Add the radio information to the column information */
   if (check_col(pinfo->cinfo, COL_TX_RATE)) {
@@ -7766,8 +7764,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr));
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism");
-    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, "Device: %.16s  "
@@ -8116,8 +8113,7 @@ dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint32 antnoise;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN");
-    if(check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
     offset = 0;
 
     version = tvb_get_ntohl(tvb, offset) - WLANCAP_MAGIC_COOKIE_BASE;
index 4f1d565beac41520bbf69a9f0c3e4d6d06b4a50c..9574667a54396bfa39977463820872ec0070026f 100644 (file)
@@ -120,8 +120,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo,
 
     /* add info to column display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ad");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     tci = tvb_get_ntohs( tvb, 0 );
 
@@ -313,8 +312,7 @@ dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo,
 
     /* add info to column display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ah");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     tci = tvb_get_ntohl( tvb, 0 );
 
index 51d917e9abd15e12a89d0771b642d049559490a7..1bfc18bb6cb8b92440a0d9a08007e63452338cf8 100644 (file)
@@ -66,8 +66,7 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tvbuff_t   *next_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGRP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   ver_and_opcode = tvb_get_guint8(tvb,0);
 
index 649f53736692c3103c8b872d605c2b97f4f56c12..915f0031a623e22f27f3a1dd02570a4b5ec2fcf8 100644 (file)
@@ -488,8 +488,7 @@ static void dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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);
 
   if(tree){
     item = proto_tree_add_item(tree, proto_imf, tvb, 0, -1, FALSE);
index 73320c66ba46a594014e6c25b50ebe331ea7891b..d02d45defb206389341405d6c69a1f93e1ade8f4 100644 (file)
@@ -86,8 +86,7 @@ dissect_infiniband(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if(pinfo->cinfo)
     {
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "InfiniBand");
-        if(check_col(pinfo->cinfo, COL_INFO))
-            col_clear(pinfo->cinfo, COL_INFO);
+        col_clear(pinfo->cinfo, COL_INFO);
     }
 
     /* Get the parent tree from the ERF dissector.  We don't want to nest under ERF */
index b4419f6cdc9d2d9494ce94763f03ff9e4c5f4f96..75d2cba26d204ea5fc9392a7f62269fd1bdf27f3 100644 (file)
@@ -65,8 +65,7 @@ dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
        eom_msg = ep_alloc(MAX_EOM_MSG_SIZE);
        eom_msg[0] = 0;
 
-       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))                                                                                              /* set the protocol column on summary display */
                col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPARS");
index afd67f7d545bf38b8bedf6e2e9fe9b7895c83722..270ae470e92bc2fe47b70b7aebfef0a7bebb7a7f 100644 (file)
@@ -117,8 +117,7 @@ dissect_tcpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        }
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCPENCAP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* If the first 4 bytes are 0x01f401f4 (udp src and dst port = 500)
           we most likely have UDP (isakmp) traffic */
index b180c61cfa80a61f165abe4433aff7fbc2cd1255..dc8ca2b4e2ec00ba8c46716b1f193e9f5ac0b03a 100644 (file)
@@ -50,8 +50,7 @@ dissect_udpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint32 spi;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDPENCAP");
-  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_udpencap, tvb, 0, -1, FALSE);
index 08b5d5edb31b2636a500aa8871e596a55735d703..081a05830e3c0aa59d33eeab498d9356a99ab034 100644 (file)
@@ -1405,8 +1405,7 @@ dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   int advance;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "AH");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   tvb_memcpy(tvb, (guint8 *)&ah, 0, sizeof(ah));
   advance = sizeof(ah) + ((ah.ah_len - 1) << 2);
@@ -1590,8 +1589,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 #endif
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   tvb_memcpy(tvb, (guint8 *)&esp, 0, sizeof(esp));
 
@@ -2612,8 +2610,7 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    * the next protocol in the stack
    */
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPComp");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   tvb_memcpy(tvb, (guint8 *)&ipcomp, 0, sizeof(ipcomp));
 
index e26b4d30bcc1cd494eb4c74c12a0a05b03eb86ed..80d4ad8bdb78a8832266c856a892fb44e5e0bc57 100644 (file)
@@ -1273,8 +1273,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   struct ip6_hdr ipv6;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPv6");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   offset = 0;
   tvb_memcpy(tvb, (guint8 *)&ipv6, offset, sizeof(ipv6));
index 8c649d9f054c60bf21360abc5ad3357b7dbed829..53ad6d6b618449b2eacf020cddf42ced7815716f 100644 (file)
@@ -260,8 +260,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* Calculate here for use in pinfo and in tree */
        ipxh->ipx_dsocket = tvb_get_ntohs(tvb, 16);
@@ -845,8 +844,7 @@ dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8          conn_number, sig_char;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX MSG");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        conn_number = tvb_get_guint8(tvb, 0);
        sig_char = tvb_get_guint8(tvb, 1);
@@ -883,8 +881,7 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        static const char       *rip_type[3] = { "Request", "Response", "Unknown" };
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX RIP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        operation = tvb_get_ntohs(tvb, 0) - 1;
 
@@ -952,8 +949,7 @@ dissect_serialization(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item      *ti;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NW_SERIAL");
-       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_serialization, tvb, 0, -1,
@@ -1224,8 +1220,7 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                "Nearest Query", "Nearest Response" };
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX SAP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        query.query_type = tvb_get_ntohs(tvb, 0);
        query.server_type = tvb_get_ntohs(tvb, 2);
index 4f52bd42e12a7a52fe4e0f27f201cb7fe0a629ba..2da9ffcb2e1029b269eb936419120b98d18eb875 100644 (file)
@@ -136,8 +136,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 compression_type;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX WAN");
-       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_ipxwan, tvb, 0, -1,
index dbb8e025f35d4f9fb24b1bff461a1d9b24f05553..4fb2bbb17b1e7686746e3febfb6a6d3dcb77c481 100644 (file)
@@ -1005,8 +1005,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 #endif /* HAVE_LIBGCRYPT */
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISAKMP");
-  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_isakmp, tvb, offset, -1, FALSE);
index cab1454f1b5a2bde255779abaa891d0349a36c23..ee89d7e85c23888f0641bc37190175bfa9324679 100644 (file)
@@ -123,8 +123,7 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 isis_system_id_len;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISIS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        isis_version = tvb_get_guint8(tvb, 2);
        if (isis_version != ISIS_REQUIRED_VERSION){
index 04c68ce1612b13445fa23268a8982b3afe239392..d403c588934672bf25eeb38ca3d5a5c0e7d4e33a 100644 (file)
@@ -158,8 +158,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len)
   const char *saved_proto;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISL");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   type = (tvb_get_guint8(tvb, 5) >> 4)&0x0F;
 
index 7b34f831136012cb4c625cf7ad563c65cd347493..a02e3cbcc303f5ff4082f952bbbfdcc3f890e883 100644 (file)
@@ -613,8 +613,7 @@ dissect_isns_pdu(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, "iSNS");
-    if (check_col(pinfo->cinfo, COL_INFO)) 
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* Get the protocol version - only version one at the moment*/ 
     isns_protocol_version = tvb_get_ntohs(tvb, offset + 0);
index 5476888a33a9260c2a969e5c14690e2e6b675cde..92e2a59f2753ef91be685eb8c87d504f2c1f83f3 100644 (file)
@@ -699,8 +699,7 @@ dissect_juniper_mlfr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint      proto,cookie_len;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLFR");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   offset = 0;
 
@@ -804,8 +803,7 @@ dissect_juniper_mlppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint      proto,cookie_len;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLPPP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   offset = 0;
 
@@ -872,8 +870,7 @@ dissect_juniper_pppoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint8     flags;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPPoE");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   offset = 0;
 
@@ -901,8 +898,7 @@ dissect_juniper_ether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint8     flags;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Ethernet");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   offset = 0;
 
@@ -930,8 +926,7 @@ dissect_juniper_ppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint8     flags;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   offset = 0;
 
@@ -959,8 +954,7 @@ dissect_juniper_frelay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint8     flags;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Frame-Relay");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   offset = 0;
 
@@ -988,8 +982,7 @@ dissect_juniper_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint8     flags;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper C-HDLC");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   ti = proto_tree_add_text (tree, tvb, offset, 4, "Juniper C-HDLC");
 
@@ -1046,8 +1039,7 @@ dissect_juniper_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16
 
   }
 
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   switch (atm_pictype) {
   case JUNIPER_PIC_ATM1:
@@ -1183,8 +1175,7 @@ static void dissect_juniper_ggsn(tvbuff_t* tvb, packet_info* pinfo, proto_tree*
   guint16    proto;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper GGSN");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
     
   ti = proto_tree_add_text (tree, tvb, offset, 4, "Juniper GGSN");
 
@@ -1214,8 +1205,7 @@ static void dissect_juniper_vp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tr
   guint8     flags;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Voice PIC");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
     
   ti = proto_tree_add_text (tree, tvb, offset, 4, "Juniper Voice PIC");
 
index 2f4038ac0ffcb2a4ca7f822aff50ff3b06542d2e..0a49939182b4f9e4a9343271f160ac499a271c5f 100644 (file)
@@ -4645,8 +4645,7 @@ static void
 dissect_kerberos_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     tcp_dissect_pdus(tvb, pinfo, tree, krb_desegment, 4, get_krb_pdu_len,
        dissect_kerberos_tcp_pdu);
@@ -4755,8 +4754,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
        }
        if (do_col_info) {
-            if (check_col(pinfo->cinfo, COL_INFO))
-                col_clear(pinfo->cinfo, COL_INFO);
+            col_clear(pinfo->cinfo, COL_INFO);
         }
         if (tree) {
             item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE);
index ddca19f2c8cea8321b2cffa2e68dc12c7e61443e..6c76601b5e7a5d2ebf2509e82d14ff803e06988a 100644 (file)
@@ -318,8 +318,7 @@ dissect_krb4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        tree = proto_item_add_subtree(item, ett_krb4);
        
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB4");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* version */
        proto_tree_add_item(tree, hf_krb4_version, tvb, offset, 1, FALSE);
index 6e59d17ec6af06d8343f23dd58905f9010dae66d..3a7b57690aafd1dc7b4856734c0485d4cb3b6a98 100644 (file)
@@ -203,8 +203,7 @@ dissect_kpasswd_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboo
         gint krb_rm_size = 0;    /* bytes consumed by record mark: 0 or 4 */
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "KPASSWD");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
         /* can't pass have_rm to dissect_kerberos_main, so strip rm first */
         if (have_rm) {
@@ -287,8 +286,7 @@ static void
 dissect_kpasswd_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "KPASSWD");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     tcp_dissect_pdus(tvb, pinfo, tree, kpasswd_desegment, 4, get_krb_pdu_len,
        dissect_kpasswd_tcp_pdu);
index 8553635b204d33482c474ceaa9498465e9345a56..f3de64de616cc770aee6d3099a8a438abd4fe68d 100644 (file)
@@ -1721,8 +1721,7 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL))      /* build output for closed L2tp frame displayed  */
                col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2TP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch (L2TP_VERSION(control)) {
 
@@ -1910,8 +1909,7 @@ dissect_l2tp_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        if (check_col(pinfo->cinfo, COL_PROTOCOL))      /* Only L2TPv3 runs directly over IP */
                col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2TPv3");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        sid = tvb_get_ntohl(tvb, index);
        if (sid == 0) {
index d0914857d35d0daf7b59b19c800b659c99a7350f..1d677951f1e210b0afd6a7a9da819b221815e5a2 100644 (file)
@@ -73,8 +73,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     tvbuff_t           *next_tvb;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPB");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     switch (pinfo->p2p_dir) {
 
index 30a586107af18e98824322c5277ad282d399fe04..9ca5f86f5a097f4cd31547fb1696170e71700f4e 100644 (file)
@@ -50,8 +50,7 @@ dissect_lapbether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     tvbuff_t           *next_tvb;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPBETHER");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     len = tvb_get_guint8(tvb, 0) + tvb_get_guint8(tvb, 1) * 256;
 
index 12a9263b9546fa8381a17918e8527db7a4ebec8b..ce5a864deb86e66802d4852e4c82f4237c9a53ad 100644 (file)
@@ -394,8 +394,7 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        const char      *dstname = "?";
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPD");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        address = tvb_get_ntohs(tvb, 0);
        cr = address & LAPD_CR;
index fd66340c1d9db96921b19eadf3a9be6524b4bc7c..30e01c5cacf418a9719890b76543b916c74531d4 100644 (file)
@@ -2466,8 +2466,7 @@ dissect_ldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDP");
 
-       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_ldp, tvb, 0, -1, FALSE);
index c6b6acd76fb4f05c9cbe06e01fd797418355a84c..d7d2b420286a310a1ef50cd5eaff87840c25dfb8 100644 (file)
@@ -238,8 +238,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        /* Show name in protocol column */
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "LINX");
        /* 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);
 
        { /* Work out the details */
                proto_item *ti        = NULL;
index 44bc992c2091ad9477df286ae7cf694ebba5305d..122e1f9fce8e1eedc83b9a1d80f0328fb1dfc295 100644 (file)
@@ -146,8 +146,7 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8          ele_id;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMI");
-       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_lmi, tvb, 0, 3, FALSE);
index 9f42a2d6176dd37ee5274757b01ebc428ece9e8f..51d034cbf3f008e582a25157ae62c9006dfbf927 100644 (file)
@@ -688,8 +688,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMP");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     version = (tvb_get_guint8(tvb, offset+0)) >> 4;
     flags = tvb_get_guint8(tvb, offset+2);
index 5cb83e5dfa9ebf96f6aecdc99b6170ba96dc4f30..569acd5b80496393201661596433650917d6b98d 100644 (file)
@@ -66,8 +66,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tvbuff_t    *next_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "LOOP");
-  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_loop, tvb, offset, -1, FALSE);
index c5925f25f7792bb8bed23aa2fc512d2c8542a855..5cc4d4f15f0aa838b304a77dc37d7af89bdaaac8 100644 (file)
@@ -78,8 +78,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        };
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "LPD");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* rfc1179 states that all responses are 1 byte long */
        code = tvb_get_guint8(tvb, 0);
index 311880e5b0f84dda40e212dcedbe1a25e0ed7877..c8a033f1400ed4a1e2c559715095253f0cc1939a 100644 (file)
@@ -151,8 +151,7 @@ dissect_lsc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   /* Protocol is LSC, packet summary is not yet known */
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "LSC");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* Too little data? */
   if (tvb->length < LSC_MIN_LEN)
index 4ed72cc41a4e592f4b95091da6a79b136fda1f05..bef490f9dcea69e15d35bf065183aa5ae1f937f7 100644 (file)
@@ -51,8 +51,7 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        pause_quanta = tvb_get_ntohs(tvb, 2);
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTRL");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   if (pause==1){
     if (check_col(pinfo->cinfo, COL_INFO)) {
index a6ba6ca872cbee76f6449bab2429ecca7af798ec..b08e2f4e40111b111ec5f490474065d8605bc364 100644 (file)
@@ -246,8 +246,7 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        /* Make entries in Protocol column on summary display */
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Modbus/TCP");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        /* Make entries in Info column on summary display */
index 43ea355c2ea06b9802ece3b28c18ee2b84c73412..80c2a22fd607cd67943a622877caf265f28c2385 100644 (file)
@@ -171,8 +171,7 @@ dissect_mdshdr(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, "MDS Header");
     
-    if (check_col (pinfo->cinfo, COL_INFO))
-        col_clear (pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     sof = tvb_get_guint8 (tvb, offset+MDSHDR_SOF_OFFSET) & 0x0F;
     pktlen = tvb_get_ntohs (tvb, offset+MDSHDR_PKTLEN_OFFSET) & 0x1FFF;
index d7f7988c89a4dc3fc470a336b8e717d653b0c9ed..ed7c71e93cf0d60bbb187cd28f84f9481102d426 100644 (file)
@@ -360,8 +360,7 @@ static int dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 */
                if (check_col(pinfo->cinfo, COL_PROTOCOL))
                        col_add_str(pinfo->cinfo, COL_PROTOCOL, "MGCP");
-               if (check_col(pinfo->cinfo, COL_INFO))
-                       col_clear(pinfo->cinfo, COL_INFO);
+               col_clear(pinfo->cinfo, COL_INFO);
 
                /*
                 * Loop through however many mgcp messages may be stuck in
index 7bfe3d4a656425c5e35ca341f0b26665b63a4956..f3e629728757d73128316f573021643650004b5e 100644 (file)
@@ -573,8 +573,7 @@ dissect_mip( 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, "MobileIP");
-  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);
   switch (type) {
index 6ade4f5df867362f305efe5998667580896c58ff..3b59b284b265c4ad6fada293b3ac58c19cad4199 100644 (file)
@@ -846,8 +846,7 @@ dissect_mip6(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, "MIPv6");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        len = (tvb_get_guint8(tvb, MIP6_HLEN_OFF) + 1) * 8;
        pproto = tvb_get_guint8(tvb, MIP6_PROTO_OFF);
@@ -947,8 +946,7 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                /* Call the IPv6 dissector */
                dissector_try_port(ip_dissector_table, pproto, ipv6_tvb, pinfo, tree);
 
-               if (check_col(pinfo->cinfo, COL_INFO))
-                       col_clear(pinfo->cinfo, COL_INFO);
+               col_clear(pinfo->cinfo, COL_INFO);
                col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement[Fast Binding Update]");
        }
 }
index abf2e259fb714d1a52dd0d75029c988ef58efe16..8cce5eb039ad6b3a8f6514d663d2378be1255f30 100644 (file)
@@ -6902,8 +6902,7 @@ dissect_mms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_mms);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        while (tvb_reported_length_remaining(tvb, offset) > 0){
                old_offset=offset;
index 3bb981dd927a46ed831489bf0970624a456959f1..5723e8e620c4f6bebce5cc4bdf657493cee1791d 100644 (file)
@@ -533,8 +533,7 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        asn1_ctx_t asn1_ctx;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        if (tree == NULL)
                return;
        asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
@@ -546,8 +545,7 @@ static void
 dissect_id3v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        proto_tree_add_item(tree, hf_id3v2, tvb,
                        0, -1, FALSE);
 }
index 8e95b36ee9d431a2570435546d193cfd98efbe06..13ac0ea68ec504830e5e99fc2c6510b5d3914f7d 100644 (file)
@@ -752,8 +752,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        if (prefix != PES_PREFIX)
                return FALSE;
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        stream = tvb_get_guint8(tvb, 3);
        if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -907,8 +906,7 @@ dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG");
-       if (check_col(pinfo->cinfo, COL_INFO))
-           col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        if (tree)
            proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, FALSE);
     }
index e01cd76cf5ce988ee9c0496a35cc3cf26b7cd040..943fb9afbfa364644bad8ac4987c4a2482f0500f 100644 (file)
@@ -217,7 +217,7 @@ dissect_mqpcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        bLittleEndian = ((mqinfo->encoding & MQ_ENC_INTEGER_REVERSED) != 0) ? TRUE : FALSE;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ PCF");        
-       if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO);         
+       col_clear(pinfo->cinfo, COL_INFO);        
        if (tvb_length(tvb) >= 36)
        {
                gint iSizeMQCFH = 36;
index aea729aa519bf8e6b79e680de384778531deede2..ed228ba0bdc4a6b285a77fcb5b14540161b6da94 100644 (file)
@@ -1085,8 +1085,7 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        conversation_t *conversation;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSproxy");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        conversation = find_conversation( pinfo->fd->num, &pinfo->src, &pinfo->dst,
                pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
index 6e80ff5671ba951f296894c45c7d2044cc37ade8..36dce82c82281d02ab73d646f3992d5cd2866643 100644 (file)
@@ -220,8 +220,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t        *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBIPX");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (pinfo->ipxptype == IPX_PACKET_TYPE_WANBCAST) {
                /*
@@ -674,8 +673,7 @@ dissect_nmpi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t        *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMPI");
-       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_nmpi, tvb, offset, 68,
index 31546903717812669a386ae6b4048dc74ce645a9..93493b3651e5b252d5b34e42faf5a896fa3287b3 100644 (file)
@@ -1042,8 +1042,7 @@ dissect_nbns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        nbns_data_offset = offset;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBNS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* To do: check for runts, errs, etc. */
        id    = tvb_get_ntohs(tvb, offset + NBNS_ID);
@@ -1210,8 +1209,7 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        name=ep_alloc(MAX_NAME_LEN);
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBDS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        header.msg_type = tvb_get_guint8(tvb, offset);
 
@@ -1635,8 +1633,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item      *ti;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBSS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        max_data = tvb_length(tvb);
 
index 7444070c7a722fb4f5a975f1aa9ec092c7cb969f..f0b6b04407598a1a514ca59885b7c5ceb0fdeee3 100644 (file)
@@ -324,8 +324,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     proto_item            *expert_item;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "NCP");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     hdr_offset = 0;
     ncp_hdr = &header;
index 15097571e33b17bda4bceec2a6dd4f6dd7038c71..22058d3e607c47d48b653636b660c502b05df472 100644 (file)
@@ -4298,8 +4298,7 @@ dissect_ndps_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDPS");
 
-    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_ndps, tvb, 0, -1, FALSE);
@@ -4492,8 +4491,7 @@ dissect_ndps_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDPS");
 
-    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_ndps, tvb, 0, -1, FALSE);
index 3fe6d02f5cd1a65cc8610402f77924f517d8b447..f510188d5ee65ae6202dd536fc84aad5958409d5 100644 (file)
@@ -572,8 +572,7 @@ dissect_netflow(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
        }
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFLOW");
-       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_netflow, tvb,
index 450005541409f45a6de10df75d0ef552fc1136cf..a80d923e9a2ea9edcfb71ee036836556edfab916 100644 (file)
@@ -1423,8 +1423,7 @@ dissect_nlsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 packet_type;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NLSP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        nlsp_major_version = tvb_get_guint8(tvb, 5);
        if (nlsp_major_version != 1){
index f404f936b390c1caf83ca2e39f1c56ba11fb9a7f..ccdf0b7e96ff7a1795b8fb4cd7c441696eee7c39 100644 (file)
@@ -941,8 +941,7 @@ dissect_nsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSIP");
     
-  if (check_col(pinfo->cinfo, COL_INFO)) 
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   pdu_type = tvb_get_guint8(tvb, 0);
   bi.offset++;
index 69e0983d35c12cceb3196672779504dd1d06f548..75470e897c9d5cd16e41be341f6270d5a9c60f72 100644 (file)
@@ -114,8 +114,7 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 length = TPCP_VER_1_LENGTH;
        
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPCP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        
        /* need to find out which version!! */
        tpcph.version = tvb_get_guint8(tvb, 0);
index 1e23c83dc9e57c834b72a381d34a00c3fb1cf5fb..5763dd94c1de327d1d724bcd758ec407f37c707b 100644 (file)
@@ -434,8 +434,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "NTP");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        flags = tvb_get_guint8(tvb, 0);
        switch (flags & NTP_MODE_MASK) {
index 3d967fb816191b1bb74bd97705b1a707b81bafde..05be12f066e135793f4932fa26046454f9f95c7d 100644 (file)
@@ -564,8 +564,7 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   }
   /*-------------Setting the Protocol and Info Columns in the Wireshark Display----------*/
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "OLSR v1");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   if ((pinfo->src.type != AT_IPv4) && (pinfo->src.type != AT_IPv6)) {
     if (check_col(pinfo->cinfo, COL_INFO)) {
index b78a20d6102edc8a1de305ee70472c51a3ee70c3..59dc3425cee355fa9cea217628dd8b6e43b66dad 100644 (file)
@@ -921,8 +921,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint8  address_family = OSPF_AF_6;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "OSPF");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     version = tvb_get_guint8(tvb, 0);
     switch (version) {
index d4212254f5ab87d42b3843b63df236ab186eeed7..500b9f1ef97984e68f4dbfea11f8fa1fc3f7e4d7 100644 (file)
@@ -98,8 +98,7 @@ dissect_paltalk_desegmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_tree *pt_tree = NULL;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Paltalk");
-       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 */
        {
index 95c05475696e3099ce0c19bfe9da875770da07ce..0a238d8f2c2139ee3d6568cf513b1ed46501ee67 100644 (file)
@@ -2098,8 +2098,7 @@ dissect_pcep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCEP");
 
        /* 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);
 
        dissect_pcep_msg_tree(tvb, tree, ett_pcep, pinfo);
 }
index 6a6591b742d977aa25e1b12e8c65c4b0b8e27040..2991b04024a529af6c4d7acb3f221384a55b7671 100644 (file)
@@ -115,8 +115,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     }
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIMv1");
-    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_pim, tvb, offset, -1, FALSE);
@@ -610,8 +609,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     proto_item *tiopt;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIM");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     pim_typever = tvb_get_guint8(tvb, 0);
 
index 393158ea1708ba4c1ada34d50f23178cf668f361..21ee423aec3cde417f988c34ac25b3e097deae20 100644 (file)
@@ -750,8 +750,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     gboolean is_ht = FALSE;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPI");
-    if(check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     version = tvb_get_guint8(tvb, offset);
     flags = tvb_get_guint8(tvb, offset + 1);
index 68bb83376a7ff5915780e516926b131900087dee..517e8cab0baf86b614b6c333c5ac52f57fd91639 100644 (file)
@@ -2903,8 +2903,7 @@ dissect_bcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP BCP");
 
-  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_bcp, tvb, 0, -1, FALSE);
index cf8b69e8e0209bd46f023c258875c4e0feff53f4..09b74612f6167e41b080b5042616385fa42c2e68 100644 (file)
@@ -236,8 +236,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint16              cntrl_type;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPTP");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   len       = tvb_get_ntohs(tvb, offset);
   cntrl_type = tvb_get_ntohs(tvb, offset + 8);
index 768dad308804f9a1e64144023e25099c0c72c8a5..949e0052a0da65b95f21225b911076e032b10305 100644 (file)
@@ -1420,8 +1420,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        /*  postpone it before dissector will have more information */
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRES");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        /* save pointers for calling the acse dissector  */
        global_tree = parent_tree;
        global_pinfo = pinfo;
index b99943349a805e3d71da8358b1126e3d9b6fa910..969d2dba16a35e2b00583eae6c15e222e6edbc11 100644 (file)
@@ -3117,8 +3117,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PVFS");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (parent_tree) 
        {
index 3ee8d8a1a489fc757abc14a1c44031e129cb754d..75f86200fdbe7cb0c2d27b526bde1d02a9e4b5bd 100644 (file)
@@ -92,8 +92,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* Summary information */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "QLLC");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     if (tree) {
        qllc_ti = proto_tree_add_item(tree, proto_qllc, tvb, 0, -1, FALSE);
index e47489df8c3cd6b0072fe28a396d9d9be141c9d4..b6f51793b482f838d18a535032ed986ae45814f5 100644 (file)
@@ -442,8 +442,7 @@ dissect_quake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t        *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        length = tvb_get_ntohl(tvb, 0);
        flags = length & (~NETFLAG_LENGTH_MASK);
index 82dc4edc0949ab14f34686b5b5116110876833ce..bb1acd26b1dd6be5262d5b44d78bfa7279664d6b 100644 (file)
@@ -1328,8 +1328,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "RADIUS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        rh.rh_code=tvb_get_guint8(tvb,0);
        rh.rh_ident=tvb_get_guint8(tvb,1);
index 445882b89cc97a6a3c7c3006ac732ce3ee25c756..63cc3345fbc1494c64f72532979c1de824aa6e16 100644 (file)
@@ -84,8 +84,7 @@ static void
 dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDM");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (tree != NULL) {
                unsigned message_length, checksum, checksum_shouldbe,
index 367f4491461a3c8aa0aea96612e7120315fa591e..7f7b460e92c9378f5e4c298951be2bab92ae19e6 100644 (file)
@@ -115,8 +115,7 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     gboolean is_md5_auth = FALSE;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIP");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     command = tvb_get_guint8(tvb, 0);
     version = tvb_get_guint8(tvb, 1);
index c50dea380e444c9c1ea59a93bae13808d0375ced..481ea26605d923c83fab67df8e4115fd1508486f 100644 (file)
@@ -60,8 +60,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     proto_item *ti;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIPng");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* avoid alignment problem */
     tvb_memcpy(tvb, (guint8 *)&rip6, offset, sizeof(rip6));
index ceb4814027b8bb1c0fa7cbc66e1026ecd3f5c184..2538dd829230e14f2ae8aec428738b4a013daf14 100644 (file)
@@ -131,8 +131,7 @@ static void dissect_alc(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, "ALC");
-       if (check_col(pinfo->cinfo, COL_INFO)) 
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        
        /* ALC header dissection */
        /* --------------------- */
index 9588794e13bacada2bdaaceb37f3f7b216af9695..5a3ec440dd2464ce9db833d7f778fab7ac380e95 100644 (file)
@@ -561,8 +561,7 @@ static void dissect_norm(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, "NORM");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* NORM header dissection, part 1 */
        /* ------------------------------ */
index 27e1d15b2d08f153f56e66c2a44df1fdf2400769..c11047c8602591a9a20aacb29fcbe5c073915e29 100644 (file)
@@ -1071,8 +1071,7 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_ros);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        while (tvb_reported_length_remaining(tvb, offset) > 0){
                old_offset=offset;
index 9954c86e6eb8824e137386ea5cfba5d1376335b1..0150ad01361e9fd63301ee6de832b87d89eea673 100644 (file)
@@ -810,8 +810,7 @@ dissect_rpcap (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_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);
 
   ti = proto_tree_add_item (top_tree, proto_rpcap, tvb, offset, -1, FALSE);
   tree = proto_item_add_subtree (ti, ett_rpcap);
index 48c45118e1c1203ed73bf1926781401dd5b864b9..7cfea64c7880ed7500d30054be9570e4ba6bd0ed 100644 (file)
@@ -3499,8 +3499,7 @@ dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        int offset = 0;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSL");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        msg_type = tvb_get_guint8(tvb,offset+1)&0x7f;
 
index 55dc1566214627d33a758adad83689e1fa137df7..570ab5d6cf8f7cc9cf0b151d730bbe8adf8d7356 100644 (file)
@@ -5440,8 +5440,7 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
        col_set_str(pinfo->cinfo, COL_PROTOCOL,
                    (pinfo->ipproto == IP_PROTO_RSVPE2EI) ? "RSVP-E2EI" : "RSVP");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     ver_flags = tvb_get_guint8(tvb, 0);
     message_type = tvb_get_guint8(tvb, 1);
index aba2c826d8d299e965e206773636cc2e1eef9891..ea6de5e2ceb6dc6a268d773fa5f502c3b35ed001 100644 (file)
@@ -103,8 +103,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSYNC");
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
                                     pinfo->srcport, pinfo->destport, 0);
index b50c2c2fe061e33a527c0bcafc4b60d0f4636411..e71723e440c19783a2f0c68f433c19bf3cadb50c 100644 (file)
@@ -371,8 +371,7 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                }
 
                col_set_writable(pinfo->cinfo, TRUE);
-               if (check_col(pinfo->cinfo, COL_INFO))
-                       col_clear(pinfo->cinfo, COL_INFO);
+               col_clear(pinfo->cinfo, COL_INFO);
 
                conversation_data->previous_frame_number = pinfo->fd->num;
                if (tvb_length_remaining(tvb, offset) >= 1)
index f1c549b1c64e1aad0390e6beb642dbf72fc89c0d..d14de2cb824742e0a27f7c51c6ff591faa8e6f25 100644 (file)
@@ -96,8 +96,7 @@ dissect_rtp_events( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
        {
            col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTP EVENT" );
        }
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
 
        /* Get event fields */
index 6f7324cdadbfcb92065e746549e4bd44fb613d3e..d1a999d44c5957196d543000f39e7a15b4cde237 100644 (file)
@@ -727,8 +727,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        }
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSE");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        if (rtse_reassemble && 
            ((session->spdu_type == SES_DATA_TRANSFER) ||
index 829bf63f98c1a312c05fccf6a4996ab352664fa7..5f31db4933b8198a96910c4adeb7a0c10e18b356 100644 (file)
@@ -107,8 +107,7 @@ dissect_rudp(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
        hlen = tvb_get_guint8(tvb, 1);
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "RUDP");
-       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_rudp, tvb, 0, hlen, FALSE);
index 6c899075921f2afaf0b05cf57decfcd2dbe768db..9816453b7a1c97d418d38f385f79d699bff451b3 100644 (file)
@@ -474,8 +474,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                return 0;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "RX");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        item = proto_tree_add_protocol_format(parent_tree, proto_rx, tvb,
                offset, 28, "RX Protocol");
index 2f3224eb60e1c59270b63467d2f0aa682e9e1bce..3d6d93c5d8dad7f290cba8099d3f5183fa374129 100644 (file)
@@ -130,8 +130,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         proto_tree *sap_tree, *sap_flags_tree;
 
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAP");
-        if (check_col(pinfo->cinfo, COL_INFO))
-                col_clear(pinfo->cinfo, COL_INFO);
+        col_clear(pinfo->cinfo, COL_INFO);
 
        vers_flags = tvb_get_guint8(tvb, offset);
         is_ipv6 = vers_flags&MCAST_SAP_BIT_A;
index 3928becd04952dc57c06a68bb44bce1eaae8150c..a73efc8739d3b5203b5077a2f76ec448260c5b6e 100644 (file)
@@ -630,8 +630,7 @@ dissect_sbus(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, "S-Bus");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) 
-              col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
        offset = 0;
 
        if (check_col(pinfo->cinfo, COL_INFO)) {
index 33af1b57327f39da4553e2412cd7c557b77446a7..1aa9b3bd4c8e8803424830381f3c227479881193 100644 (file)
@@ -81,8 +81,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t        *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDLC");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        address = tvb_get_guint8(tvb, 0);
        sdlc_header_len = 1;    /* address */
index ac3f2bf97e912afc6b1a523fb73289976c0e48f0..7a873ec158967cf80cbae977f84fa1291d20e11a 100644 (file)
@@ -1109,8 +1109,7 @@ dissect_ses(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 type;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "SES");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /*
         * Do we have a category 0 SPDU (GIVE_TOKENS/PLEASE_TOKENS) as
index 121174f240d79d1f20e30ded1d889e3f86ba96ae..ab76196cb99b185d6bd512d9b6f0576f1549bd09 100644 (file)
@@ -412,8 +412,7 @@ dissect_sigcomp_tcp(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, "SIGCOMP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) 
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        length = tvb_length_remaining(tvb,offset);
 
@@ -530,8 +529,7 @@ dissect_sigcomp(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, "SIGCOMP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) 
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        top_tree = tree;
 
index 3ebfc3e9dd65bd669ab4172040b01ab15c035208..b687eb2cced433ec8e3e6db5c453720cac17a0db 100644 (file)
@@ -118,8 +118,8 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        const gchar     *signals_str[]          = {"DSR",                       "DTR",          "CTS",                  "RTS",                  "DCD",                  "",                     "",             ""                              };
        const gchar     *flags_str[]            = {"",                          "",                     "",                             "",                             "",                             "",                     "",             "No-buffers"    };
 
-       if (check_col(pinfo->cinfo, COL_PROTOCOL))      col_clear(pinfo->cinfo, COL_PROTOCOL);          /* erase the protocol */
-       if (check_col(pinfo->cinfo, COL_INFO))          col_clear(pinfo->cinfo, COL_INFO);                      /* and info columns so that the next decoder can fill them in */
+       col_clear(pinfo->cinfo, COL_PROTOCOL);          /* erase the protocol */
+       col_clear(pinfo->cinfo, COL_INFO);                      /* and info columns so that the next decoder can fill them in */
 
        flags   = pinfo->pseudo_header->sita.flags;
        signals = pinfo->pseudo_header->sita.signals;
index 49ae821a2bcfcfc665bba2cfd210a5de9f32d32e..6ef8ed39d9df550941d49752c5de35103eba70f8 100644 (file)
@@ -157,8 +157,7 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_tree *fh_tree = NULL;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLL");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        pkttype = tvb_get_ntohs(tvb, 0);
 
index 2e70e3cfbb92b0d8c1cc5ecbce3e397e455d6134..1601523ffe8dadd90e72a3d14a3ad323d922a09c 100644 (file)
@@ -923,8 +923,7 @@ dissect_smb_logon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item *item = NULL;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB_NETLOGON");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* get the Command field */
        cmd = tvb_get_guint8(tvb, offset);
index e568771d3827df4d0b800b47f184e9219218e7bb..f6123611da3b729bd0e7992ffade9afe755e0aee 100644 (file)
@@ -2564,8 +2564,7 @@ dissect_sna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item      *sna_ti = NULL;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNA");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* SNA data should be printed in EBCDIC, not ASCII */
        pinfo->fd->flags.encoding = CHAR_EBCDIC;
@@ -2600,8 +2599,7 @@ dissect_sna_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item      *sna_ti = NULL;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNA");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* SNA data should be printed in EBCDIC, not ASCII */
        pinfo->fd->flags.encoding = CHAR_EBCDIC;
index ebd0d84df2dc3231bd64a83000dbdac490628f76..2deafb641afd8c4194968a9914ccab5012574a45 100644 (file)
@@ -209,8 +209,7 @@ dissect_sndcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   /* Make entries in Protocol column and clear Info column on summary display 
    */
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNDCP");
-  if (check_col(pinfo->cinfo, COL_INFO)) 
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
   
   /* create display subtree for the protocol 
    */
index dfddef67b388169a76ba264a1cadc03d8efb6fcc..14e7e0844fe41499dcf448d96107ce4e6604cea5 100644 (file)
@@ -493,8 +493,7 @@ static gboolean ParseCommand(proto_tree *tree,tvbuff_t *tvb, int offset, packet_
                if (tree)
                        proto_tree_add_text(tree, tvb, offset+dataLen-SQLDataLen, SQLDataLen,
                            "SQL statement = %s",m_pCurQuery);
-    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_str(pinfo->cinfo, COL_INFO, m_pCurQuery );
                return TRUE;
@@ -540,8 +539,7 @@ static gboolean ParseNewCommand( proto_tree *tree,tvbuff_t *tvb, int offset, pac
        if (FindBeginningSQLString((UI8_P*)&pAddr, (UI16_P)&sqlamount, 13) == TRUE)
        {
                ParseSqlStatement( pAddr, amount);
-    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_str(pinfo->cinfo, COL_INFO, m_pCurQuery );
                proto_tree_add_text(tree, tvb, offset+amount-sqlamount, sqlamount,
@@ -567,8 +565,7 @@ dissect_sqloracle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        pinfo->current_proto = "SQLORACLE";
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "SQL");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
        header_operation = tvb_get_guint8(tvb, offset);
        dataLen = tvb_reported_length_remaining(tvb, offset);
index 87ce155446f74d26793f5b2cc50ff056b903ea73..7789a9aa41b3db5824be6862203e3be6c29efc60 100644 (file)
@@ -825,8 +825,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "SRVLOC");
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     version = tvb_get_guint8(tvb, offset);
     function = tvb_get_guint8(tvb, offset + 1);
@@ -1421,8 +1420,7 @@ dissect_srvloc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "SRVLOC");
 
-    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_srvloc, tvb, 0, -1, FALSE);
index 0719717635cfe84ecfa874d61f9673c4758914af..a088bde70957791ba9641a03dd7634581e2e96bb 100644 (file)
@@ -620,8 +620,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSL");
     }
     /* clear the the info column */
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* TCP packets and SSL records are orthogonal.
      * A tcp packet may contain multiple ssl records and an ssl
index c58b4e2c925a368b56ac3de797b3a185d13148e6..258d3f087555a70c463eaa49ab2b58c0f44819a9 100644 (file)
@@ -1960,8 +1960,7 @@ dissect_sua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
     }
 
   /* Clear entries in Info column on summary display */
-  if (check_col(pinfo->cinfo, COL_INFO))
-     col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* In the interest of speed, if "tree" is NULL, don't do any work not
      necessary to generate protocol tree items. */
index 7f1fcf9157923a7ba610aca40ca2a4630ad0cb1d..012a8e2c7522de68c6d5177419a617d620bb5624 100644 (file)
@@ -235,8 +235,7 @@ dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tvbuff_t *mtp3_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "Syslog");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   if (tvb_get_guint8(tvb, msg_off) == '<') {
     /* A facility and level follow. */
index d2356e6842da7772fdba4172d39fc8e9e1876c67..23405cd17579fbe8fb1374eba000feb276325b86 100644 (file)
@@ -156,8 +156,7 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8          txt_buff[255+1],version,type,userlen,passlen;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        version = tvb_get_guint8(tvb,0);
        if (version != 0) {
index 8278826491d5c6de2ad03db54f713bf28dc4b51d..7a1c1553c62a9a7c99db2cd4319fc1333e9ab300 100644 (file)
@@ -3008,8 +3008,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCP");
 
   /* Clear out the Info column. */
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   tcph->th_sport = tvb_get_ntohs(tvb, offset);
   tcph->th_dport = tvb_get_ntohs(tvb, offset + 2);
index ccbe686e66cca4f72dd39f9afdbb9c0128a02f92..c09001094f367e471a740f617763e4c9b437d99c 100644 (file)
@@ -77,8 +77,7 @@ dissect_teimanagement(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint8 message;
     
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "TEI");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
     
     if (tree) {
        tei_ti = proto_tree_add_item(tree, proto_tei, tvb, 0, 5, FALSE);
index 33eefb50b3be6077507f08e5d82d4e6bb32fd4ef..8903a5b5b15bea4736312a30df18eba14698ef40 100644 (file)
@@ -64,8 +64,7 @@ dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        telkonet_type_t type;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELKONET");
-       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)) {
index fbdc7e5ae1fe5edc9052290d780d172cb9e275a6..64bfc8aaf942554409f73aaf53606bf25d8e8433 100644 (file)
@@ -231,8 +231,7 @@ dissect_teredo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        teredoh = &teredohstruct[teredoh_count];
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo");
-       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_teredo, tvb, 0, -1, FALSE);
index 5e7072f9c022b713764503e4e91caa1334f7cf24..b6f3e96e76cf3efec9483c0985b66935332f8819 100644 (file)
@@ -2047,8 +2047,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        /* Make entry in Protocol column on summary display */
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIPC");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        top_tree = tree;
        dword = tvb_get_ntohl(tvb, offset);
index ea3466d496bdae9c30fa65d63e2aba5ed36399b0..afd3491bd102c00d0e0d638c55810828d804b02b 100644 (file)
@@ -3818,8 +3818,7 @@ dissect_tn3270(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   if (tree) {
     ti = proto_tree_add_item(tree, proto_tn3270, tvb, offset, -1, FALSE);
     tn3270_tree = proto_item_add_subtree(ti, ett_tn3270);
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     if (tn3270_info->extended) {
         offset += dissect_tn3270e_header(tn3270_tree, tvb, offset);
index 143cb1f57931dd2f81b03b4c6e923231a76dc31a..9ad5ca6f6eb068dd613aab8749b23817cd960d9e 100644 (file)
@@ -288,8 +288,7 @@ dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8          mv_val;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TR MAC");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        mv_val = tvb_get_guint8(tvb, 3);
 
index 678c1a60e67bb0e9097c3fcbef3f04eee42c2f66..c4697f9322305e05a7b7943d34301e23f5566af3 100644 (file)
@@ -117,8 +117,7 @@ dissect_tsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8          tsp_type;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TSP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        tsp_type = tvb_get_guint8(tvb, 0);
        if (check_col(pinfo->cinfo, COL_INFO))
index 1ad93d7d4f4d0fcccff4fdab2ceb5bbb387b3bc1..dd0940a9776a55edfbc6e8e0d15715be7ba4dbc8 100644 (file)
@@ -291,8 +291,7 @@ dissect_tzsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 type;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "TZSP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        type = tvb_get_guint8(tvb, 1);
 
index 4254c5401b9580ec1423742c41b0187340d7ebdd..6fef266b2c9e0c7f7511c447902e128da0f4cae7 100644 (file)
@@ -111,8 +111,7 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     int real_length;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDLD");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     if (tree) {
        proto_item *flags_ti;
index 3acbfae795ebb32ee6fd52d208a4ac348a523011..b70ab69e5bfa17be495f4d1c2d51641d57b95cea 100644 (file)
@@ -1671,8 +1671,7 @@ dissect_uma(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, "UMA");
-       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_uma, tvb, 0, -1, FALSE);
        uma_tree = proto_item_add_subtree(ti, ett_uma);
@@ -1753,8 +1752,7 @@ dissect_uma_urlc_udp(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, "UMA");
-       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_uma, tvb, 0, -1, FALSE);
        uma_tree = proto_item_add_subtree(ti, ett_uma);
index 3c82ac89dce5f28285179e40591ae1bdac100c91..26c9cb108f8905cc5903265e08e3869610611da8 100644 (file)
@@ -209,8 +209,7 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBMS");
 
-    if(check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
 
     if(parent_tree){
index 9e051687e26e60166f78a355ba860079f50efd7a..5d1908be2c5d5bc0a1bd814110ace12d031d06b7 100644 (file)
@@ -101,8 +101,7 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     info=ep_alloc(80);
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "V.120");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     byte0 = tvb_get_guint8(tvb, 0);
 
index 493aa2352f6d3e4772fa99b0370557ad5a4a0496..df3f4923e87b589e29d1752ad0b89ed130ff003e 100644 (file)
@@ -60,8 +60,7 @@ static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "VICP");
 
-   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_vicp, tvb, 0, -1, FALSE);
    vicp_tree = proto_item_add_subtree(ti, ett_vicp);
index bc33a21262ece8e9a4b939ff08db2f158fb2ca5a..ef87d7ac1f6fd427ec5615893a4edf67c9c4acfb 100644 (file)
@@ -110,8 +110,7 @@ dissect_vines_frp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines FRP");
-       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_vines_frp, tvb, 0, 2,
@@ -208,8 +207,7 @@ dissect_vines_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines LLC");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        ptype = tvb_get_guint8(tvb, 0);
        if (check_col(pinfo->cinfo, COL_INFO))
@@ -296,8 +294,7 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines IP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* To do: check for runts, errs, etc. */
 
@@ -441,8 +438,7 @@ dissect_vines_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item *ti;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines Echo");
-       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_vines_echo, tvb, 0, -1,
@@ -518,8 +514,7 @@ dissect_vines_ipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "VIPC");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* To do: check for runts, errs, etc. */
 
@@ -717,8 +712,7 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t    *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "VSPP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* To do: check for runts, errs, etc. */
 
@@ -865,8 +859,7 @@ dissect_vines_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint16  metric;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines ARP");
-       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_vines_arp, tvb, 0, -1,
@@ -1044,8 +1037,7 @@ dissect_vines_rtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint16  metric;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines RTP");
-       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_vines_rtp, tvb, 0, -1,
@@ -1550,8 +1542,7 @@ dissect_vines_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines ICP");
-       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_vines_icp, tvb, 0, -1,
index 96d829e050c2ef1669717446664d14681afd2986..ddb644bcf5066ff0f7b1e92b6a7d877d516a5800 100644 (file)
@@ -80,8 +80,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_tree *volatile vlan_tree;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "VLAN");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   tci = tvb_get_ntohs( tvb, 0 );
 
index 18b0d8ecff136b6c8afdb436052be7b76bca6122..14207aeed60096ca9a253d6026e4170f76a03103 100644 (file)
@@ -557,8 +557,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "VNC");
 
        /* First, clear the info column */
-       if(check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /* create display subtree for the protocol */
        if(tree) {
index 1e9ff05852494d943f1316bd990bf7f949c0eede..9caaba0bf090b5e9a6fce6a81c862534b4e18dc5 100644 (file)
@@ -93,8 +93,7 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint32 phdr[2];
 
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "VRRP");
-        if (check_col(pinfo->cinfo, COL_INFO))
-                col_clear(pinfo->cinfo, COL_INFO);
+        col_clear(pinfo->cinfo, COL_INFO);
 
        ver_type = tvb_get_guint8(tvb, 0);
         if (check_col(pinfo->cinfo, COL_INFO)) {
index e931e84929f3d7803b8a971062c85ddeb862a9c2..fc61c28df18792457ca228fcf6f17cd5d0ccfbdf 100644 (file)
@@ -302,8 +302,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
        tvbuff_t        *next_tvb;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        temp =tvb_get_ntohs(tvb, 0);
 
index 54a3a9e76a636a4dec71c1205f227ca5c78f4531..06c3b812f5ace9a4ed8295ef190cbffef585edc1 100644 (file)
@@ -59,8 +59,7 @@ dissect_wfleet_hdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
   col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHDLC");
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   addr = tvb_get_guint8(tvb, 0);
   cmd = tvb_get_guint8(tvb, 1);
index e8d3878dc32a46401c40bca05ca8f89aa42f05a0..c270a29e39dc823c9abfe6d3e6c5407a3ef8708a 100644 (file)
@@ -101,8 +101,7 @@ dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        /* Summary information */
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHO");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        ts.nsecs = 0;
 
index 380f2b161d9ca7ac089c81be22916fecdfccae36..7cb140e5bebff80a2e1d5df5b118be2bf588b4fb 100644 (file)
@@ -180,8 +180,7 @@ dissect_wol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    past the end of the packet, so that the Info column doesn't have data
    left over from the previous dissector; do
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
    */
 
index 86b313e281adfb3b31ed81dce58d65da2c8afa27..45736b0696722f1246b5d3129bc6f464d70b1bcf 100644 (file)
@@ -207,8 +207,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "WOW");
 
-       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);
 
index 3e7ec39634ef25951d66be40678f8232d8567509..48595ffc3d83712bc6b50bf4d522302baa0eb7bf 100644 (file)
@@ -5437,8 +5437,7 @@ static void
 dissect_wsp_fromudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "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, wsp_fromudp_handle, TRUE);
 }
index 6a2823dcba9a3a56ee7d43c2c3028e4e26e12933..923a234c97d2110335adf39b1d8fe6042ef72fb8 100644 (file)
@@ -786,8 +786,7 @@ static void
 dissect_wtp_fromudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTP+WSP");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     dissect_wtp_common(tvb, pinfo, tree);
 }
@@ -805,8 +804,7 @@ static void
 dissect_wtp_fromwtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTLS+WTP+WSP");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     dissect_wtp_common(tvb, pinfo, tree);
 }
index ae577611c504bfbe2fcdd429789b62651b482790..731b5cd02ad83616c47c3143d60849d61d765357 100644 (file)
@@ -92,8 +92,7 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        int linelen;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.29");
-       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_x29, tvb, offset, -1,
index 616996aa6d6a531ddcb70f15700721843ca4737a..045dfefc2c84bfe2a65ff5eaa04679963e0b8289 100644 (file)
@@ -8412,8 +8412,7 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                tree = proto_item_add_subtree(item, ett_x411);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        switch(session->ros_op & ROS_OP_MASK) {
        case (ROS_OP_BIND | ROS_OP_ARGUMENT):   /*  BindInvoke */
index 18ac7bab7a9a9e1f9ff4c9ea7ab43ba6b5e6ffec..4af8189448bc0693f2b1c405b51c5859bf10d518 100644 (file)
@@ -132,8 +132,7 @@ static void dissect_xcsl_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 
    /* color support */
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Xcsl");
-   if (check_col(pinfo->cinfo, COL_INFO))
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
    /* Create display tree for the xcsl protocol */
    if (tree) {
index 11ec24d31a7aefc25a5c95206d54f26db7353ee6..3a67e2a3f9011202bcad109fe3d7364548e2e670 100644 (file)
@@ -200,8 +200,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   }
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "XDMCP");
-  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_xdmcp, tvb, offset, -1, FALSE);
index ec5bec8462857be2021e510e7a0979764581f7cd..1c153c078a4b541d538d98a3b8acae3c6f9049b4 100644 (file)
@@ -812,8 +812,7 @@ dissect_xtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
                return 0;
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "XTP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
 
        /** parse header **/
        offset = 0;
index 1ed411a45770a6bd831953a86880f7d2ab9e7a66..06d9ef2514b177ae4b16599cfdabc5b1a2321145 100644 (file)
@@ -737,8 +737,7 @@ dissect_asn1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "ASN.1 %s", current_pduname);
   }
 
-  if(check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
 
   offstr[0] = 0;
index c8afcb42ba11e88e920d5d6290d4cc75d6d6cb5b..e2ebff7d6bea0393b630e995b864abefa8b4d96f 100644 (file)
@@ -135,8 +135,7 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   guint8 type;
   col_set_str (pinfo->cinfo, COL_PROTOCOL, "DOCSIS MGMT");
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    col_clear (pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
 
   src = tvb_get_ptr (tvb, 6, 6);
index 44b8814c10e2cc986d46f39834ea6c407caf4f40..82076d3c316701a86017af3f3947c01df03ae21e 100644 (file)
@@ -396,8 +396,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMS");
 
-   if (check_col(pinfo->cinfo, COL_INFO)) 
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
    if( pinfo->ethertype != 0x88a4 )
    {
index 02ec0a28cca682d821f516da93507dd04e87fbe7..faa191b1decd1b97a2a399c1cb0af3d3a8336e33 100644 (file)
@@ -464,8 +464,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECAT");
 
-   if (check_col(pinfo->cinfo, COL_INFO))
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
    /* If the data portion of an EtherCAT datagram is less than 44 bytes, then
       it must have been padded with an additional n number of bytes to reach a
index 780451181e95b324f333cb84524aeb4fcdae6513..ce236611115fdd85f2671a1c7688950b8d3d0021 100644 (file)
@@ -71,8 +71,7 @@ static void dissect_ioraw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "IO-RAW");
 
-   if (check_col(pinfo->cinfo, COL_INFO))
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
       
    IoRawSummaryFormater(szText, nMax);
index 2bd6fed5f7d5a413dd923942d2b851b0c2967a42..350fc2d17c4258bc332384759e86e8d923cb3aa8 100644 (file)
@@ -112,8 +112,7 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "TC-NV");
 
-   if (check_col(pinfo->cinfo, COL_INFO)) 
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
    
    NvSummaryFormater(tvb, offset, szText, nMax);
    if (check_col(pinfo->cinfo, COL_INFO)) 
index 6152c674f4eeaeecddbe8a273d3a2aa7b7af67a9..935ba3b1a56e7d5c55998a74102df2d000643d6c 100644 (file)
@@ -211,8 +211,7 @@ dissect_gryphon_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     if (!is_msgresp_add) {
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gryphon");
-       if (check_col(pinfo->cinfo, COL_INFO))
-           col_clear(pinfo->cinfo, COL_INFO);
+       col_clear(pinfo->cinfo, COL_INFO);
     }
 
     if (!is_msgresp_add) {
index 9698051366665d2ced7da1e47578fc5f6ddabece..6361383426cdbb012dc2e6aa2ebdc3740ae25ac8 100644 (file)
@@ -1726,8 +1726,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrLAP");
 
     /* Clear Info column */
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* set direction column */
     if (check_col(pinfo->cinfo, COL_IF_DIR))
index df2a9534f9cd1a56e6861521a9e1a2288931db2b..f0af8afa821844e76f0ad1d00e4f3dbe170cb5d3 100644 (file)
@@ -57,8 +57,7 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   /* setup columns */
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "SERCOS III V1.1");
-  if(check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* check what we got on our hand */
   type = tvb_get_guint8(tvb, 0);