diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
| commit | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (patch) | |
| tree | 794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors | |
| parent | 5d5a5442d678c9a2f6a66522cc00013d3476cda6 (diff) | |
Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
Diffstat (limited to 'epan/dissectors')
191 files changed, 255 insertions, 507 deletions
diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c index bcc2221afa..a105b19244 100644 --- a/epan/dissectors/packet-3com-xns.c +++ b/epan/dissectors/packet-3com-xns.c @@ -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); diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index 6a9a6fd832..3c7cee0568 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -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: diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 0a46abb1aa..74636ddb0b 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -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); diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c index 63f9534177..815a3d8ebc 100644 --- a/epan/dissectors/packet-aarp.c +++ b/epan/dissectors/packet-aarp.c @@ -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); diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 8a5fc63f21..e31914aad8 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -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 */ diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 9ac42bd4ab..1ee3dd81ed 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -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) { diff --git a/epan/dissectors/packet-airopeek.c b/epan/dissectors/packet-airopeek.c index dace13dcda..aa14e2066b 100644 --- a/epan/dissectors/packet-airopeek.c +++ b/epan/dissectors/packet-airopeek.c @@ -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); diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index 42b06ccc03..3fe64a459d 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -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); diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 0f921e9581..1197b977ba 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -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); diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index 06543f5f00..18681f3fd7 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.c @@ -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); diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index 5a8412acdc..753d67af51 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -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); diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 6b6eb17529..5723c1a51e 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -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); diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index 78a360a725..eff14b8726 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -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) { diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index d478f0bafc..726ae0f5c3 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -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); diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 3535e6404b..7e51052cfe 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -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); diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 181f80b5bb..26885ba7b8 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -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); diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index 12cf1e12c2..d61bdb77bb 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -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); diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 899c418d10..2e8d932f64 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -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); diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 955cdd3522..ec49481ef0 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -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. diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c index 1bc3412481..8e392aee81 100644 --- a/epan/dissectors/packet-bofl.c +++ b/epan/dissectors/packet-bofl.c @@ -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); diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index ed28d40bd1..02fa429fa1 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -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; diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index bf88e178c0..1f3d439946 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -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++; diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index f61c8cec79..65538df130 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -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); diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index c4cfdedf89..6991f02cc0 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -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); diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 15e18a084b..cfaeed7ec2 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -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); diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index ddebf5272b..80e106941a 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -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: "); diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index a8f17dc59f..a57de95464 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -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) { diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 61c4fad662..147575f2d0 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -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: diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c index 042b25214c..b61b1b9d8e 100644 --- a/epan/dissectors/packet-cmpp.c +++ b/epan/dissectors/packet-cmpp.c @@ -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); diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 92392be888..dd7ea976ab 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -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)) diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index 58d904feb0..88009c5561 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.c @@ -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); diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c index b11c7ba04d..d471123100 100644 --- a/epan/dissectors/packet-cups.c +++ b/epan/dissectors/packet-cups.c @@ -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, diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index b4c67b0a3b..ca878d9269 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -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); diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index a45baca429..2caccc1d00 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -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) { diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 98900be34c..38d2ac8664 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -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)); } diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index b68e5480ca..25ec6d1e73 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -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 */ diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index d166ad7afc..8146ef15a8 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -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, diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index f3c8ae98ec..9c6b584a0d 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -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)) diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 4a4f761c8c..a15e6439f9 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -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; } diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 18b1ccc7a0..fe02348806 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -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); diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 1fdb2d79c9..39efd67102 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -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 */ diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 342eca720b..7193d31ba2 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -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"); diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index d71b1cc159..5f4233d3a5 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -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 */ diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index c53ab89f36..f07e568e1a 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -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) diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 96723f6478..35b592abd8 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -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); diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index f14c873e7b..e104c5f390 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -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); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index f99eeaec11..7e9feeb485 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -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, diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 573c073e70..f62f78a504 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -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); diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 3636f40f03..f1ee3963d1 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -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 ) { diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c index c07dbfaedf..dd409abe15 100644 --- a/epan/dissectors/packet-esis.c +++ b/epan/dissectors/packet-esis.c @@ -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); diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index e3b254bc6b..a96b809fbc 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -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; diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index de5326307b..95f1437d0a 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -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"); diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 08ff47db03..fb14b38fb2 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -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; diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index 5bc712fa94..72d7baa67e 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -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); */ diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index 747ac24db3..f099fe8258 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.c @@ -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)) diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index bb21e1f7fa..3ba14f1359 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -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 diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index c8e6214c5d..f6ece0b3ad 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -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) { diff --git a/epan/dissectors/packet-gprs-ns.c b/epan/dissectors/packet-gprs-ns.c index fe35516dcc..2e960f20f1 100644 --- a/epan/dissectors/packet-gprs-ns.c +++ b/epan/dissectors/packet-gprs-ns.c @@ -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)) { diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index c5585c833d..9097fc52bd 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -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? diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 54fdf313d6..8208006c5d 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -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); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 1e85f1e45f..5210285754 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -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); diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index 2b8192f0dd..73b92d1f2e 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.c @@ -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; diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c index 6f05e01252..d4dc738e68 100644 --- a/epan/dissectors/packet-hyperscsi.c +++ b/epan/dissectors/packet-hyperscsi.c @@ -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); diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index cc7e4a3fe6..1531ca194d 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -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)); diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 5187254bdc..94fb84c549 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -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); diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index d70f4d044a..a004e34646 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -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); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 7bfb0caad5..6540c995d2 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -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; diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index 4f1d565bea..9574667a54 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -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 ); diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index 51d917e9ab..1bfc18bb6c 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -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); diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 649f537366..915f0031a6 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -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); diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 73320c66ba..d02d45defb 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -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 */ diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c index b4419f6cdc..75d2cba26d 100644 --- a/epan/dissectors/packet-ipars.c +++ b/epan/dissectors/packet-ipars.c @@ -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"); diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index afd67f7d54..270ae470e9 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -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 */ diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c index b180c61cfa..dc8ca2b4e2 100644 --- a/epan/dissectors/packet-ipsec-udp.c +++ b/epan/dissectors/packet-ipsec-udp.c @@ -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); diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 08b5d5edb3..081a05830e 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -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)); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index e26b4d30bc..80d4ad8bdb 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -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)); diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 8c649d9f05..53ad6d6b61 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -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); diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 4f52bd42e1..2da9ffcb2e 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -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, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index dbb8e025f3..4fb2bbb17b 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -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); diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index cab1454f1b..ee89d7e85c 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -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){ diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 04c68ce161..d403c58893 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -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; diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 7b34f83113..a02e3cbcc3 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -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); diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 5476888a33..92e2a59f27 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -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"); diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 2f4038ac0f..0a49939182 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -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); diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index ddca19f2c8..6c76601b5e 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -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); diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 6e59d17ec6..3a7b57690a 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -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); diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 8553635b20..f3de64de61 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -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) { diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index d0914857d3..1d677951f1 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -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) { diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c index 30a586107a..9ca5f86f5a 100644 --- a/epan/dissectors/packet-lapbether.c +++ b/epan/dissectors/packet-lapbether.c @@ -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; diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 12a9263b95..ce5a864deb 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -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; diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index fd66340c1d..30e01c5cac 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -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); diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index c6b6acd76f..d7d2b42028 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -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; diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index 44bc992c20..122e1f9fce 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -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); diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 9f42a2d617..51d034cbf3 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -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); diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index 5cb83e5dfa..569acd5b80 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.c @@ -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); diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index c5925f25f7..5cc4d4f15f 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -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); diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index 311880e5b0..c8a033f140 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.c @@ -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) diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index 4ed72cc41a..bef490f9dc 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -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)) { diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index a6ba6ca872..b08e2f4e40 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -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 */ diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index 43ea355c2e..80c2a22fd6 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -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; diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index d7f7988c89..ed7c71e93c 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -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 diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 7bfe3d4a65..f3e6297287 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -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) { diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 6ade4f5df8..3b59b284b2 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -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]"); } } diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index abf2e259fb..8cce5eb039 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -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; diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 3bb981dd92..5723e8e620 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -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); } diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 8e95b36ee9..13ac0ea68e 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -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); } diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c index e01cd76cf5..943fb9afbf 100644 --- a/epan/dissectors/packet-mq-pcf.c +++ b/epan/dissectors/packet-mq-pcf.c @@ -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; diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index aea729aa51..ed228ba0bd 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -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); diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c index 6e80ff5671..36dce82c82 100644 --- a/epan/dissectors/packet-nbipx.c +++ b/epan/dissectors/packet-nbipx.c @@ -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, diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index 3154690371..93493b3651 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -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); diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 7444070c7a..f0b6b04407 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -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; diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 15097571e3..22058d3e60 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -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); diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 3fe6d02f5c..f510188d5e 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -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, diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 4500055414..a80d923e9a 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -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){ diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index f404f936b3..ccdf0b7e96 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -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++; diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index 69e0983d35..75470e897c 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -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); diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 1e23c83dc9..5763dd94c1 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -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) { diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 3d967fb816..05be12f066 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -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)) { diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index b78a20d610..59dc3425ce 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -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) { diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c index d4212254f5..500b9f1ef9 100644 --- a/epan/dissectors/packet-paltalk.c +++ b/epan/dissectors/packet-paltalk.c @@ -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 */ { diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index 95c0547569..0a238d8f2c 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -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); } diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 6a6591b742..2991b04024 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -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); diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 393158ea17..21ee423aec 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -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); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 68bb83376a..517e8cab0b 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -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); diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index cf8b69e8e0..09b74612f6 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -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); diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 768dad3088..949e0052a0 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -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; diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index b99943349a..969d2dba16 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -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) { diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c index 3ee8d8a1a4..75f86200fd 100644 --- a/epan/dissectors/packet-qllc.c +++ b/epan/dissectors/packet-qllc.c @@ -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); diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index e47489df8c..b6f51793b4 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -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); diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 82dc4edc09..bb1acd26b1 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -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); diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index 445882b89c..63cc3345fb 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -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, diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 367f449146..7f7b460e92 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -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); diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index c50dea380e..481ea26605 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -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)); diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c index ceb4814027..2538dd8292 100644 --- a/epan/dissectors/packet-rmt-alc.c +++ b/epan/dissectors/packet-rmt-alc.c @@ -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 */ /* --------------------- */ diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index 9588794e13..5a3ec440dd 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -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 */ /* ------------------------------ */ diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 27e1d15b2d..c11047c860 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -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; diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 9954c86e6e..0150ad0136 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -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); diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index 48c45118e1..7cfea64c78 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -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; diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 55dc156621..570ab5d6cf 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -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); diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index aba2c826d8..ea6de5e2ce 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -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); diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index b50c2c2fe0..e71723e440 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -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) diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index f1c549b1c6..d14de2cb82 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -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 */ diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 6f7324cdad..d1a999d44c 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -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) || diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index 829bf63f98..5f31db4933 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -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); diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 6c89907592..9816453b7a 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -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"); diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index 2f3224eb60..3d6d93c5d8 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -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; diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index 3928becd04..a73efc8739 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -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)) { diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index 33af1b5732..1aa9b3bd4c 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -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 */ diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index ac3f2bf97e..7a873ec158 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -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 diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 121174f240..ab76196cb9 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -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; diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index 3ebfc3e9dd..b687eb2cce 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -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; diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 49ae821a2b..6ef8ed39d9 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -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); diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 2e70e3cfbb..1601523ffe 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -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); diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index e568771d38..f6123611da 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -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; diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index ebd0d84df2..2deafb641a 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -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 */ diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c index dfddef67b3..14e7e0844f 100644 --- a/epan/dissectors/packet-sqloracle.c +++ b/epan/dissectors/packet-sqloracle.c @@ -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); diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 87ce155446..7789a9aa41 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -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); diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 0719717635..a088bde709 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -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 diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index c58b4e2c92..258d3f0875 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -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. */ diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 7f1fcf9157..012a8e2c75 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -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. */ diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index d2356e6842..23405cd175 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -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) { diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 8278826491..7a1c1553c6 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -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); diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c index ccbe686e66..c09001094f 100644 --- a/epan/dissectors/packet-teimanagement.c +++ b/epan/dissectors/packet-teimanagement.c @@ -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); diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index 33eefb50b3..8903a5b5b1 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -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)) { diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index fbdc7e5ae1..64bfc8aaf9 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -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); diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 5e7072f9c0..b6f3e96e76 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -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); diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index ea3466d496..afd3491bd1 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -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); diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 143cb1f579..9ad5ca6f6e 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -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); diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c index 678c1a60e6..c4697f9322 100644 --- a/epan/dissectors/packet-tsp.c +++ b/epan/dissectors/packet-tsp.c @@ -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)) diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 1ad93d7d4f..dd0940a977 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -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); diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index 4254c5401b..6fef266b2c 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -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; diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 3acbfae795..b70ab69e5b 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -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); diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index 3c82ac89dc..26c9cb108f 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -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){ diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index 9e051687e2..5d1908be2c 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.c @@ -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); diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index 493aa2352f..df3f4923e8 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.c @@ -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); diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index bc33a21262..ef87d7ac1f 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -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, diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 96d829e050..ddb644bcf5 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -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 ); diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 18b0d8ecff..14207aeed6 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -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) { diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index 1e9ff05852..9caaba0bf0 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -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)) { diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index e931e84929..fc61c28df1 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -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); diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index 54a3a9e76a..06c3b812f5 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/epan/dissectors/packet-wfleet-hdlc.c @@ -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); diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index e8d3878dc3..c270a29e39 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -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; diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index 380f2b161d..7cb140e5be 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -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); */ diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 86b313e281..45736b0696 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -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); diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 3e7ec39634..48595ffc3d 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -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); } diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index 6a2823dcba..923a234c97 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -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); } diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index ae577611c5..731b5cd02a 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -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, diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 616996aa6d..045dfefc2c 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -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 */ diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index 18ac7bab7a..4af8189448 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -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) { diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 11ec24d31a..3a67e2a3f9 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -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); diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index ec5bec8462..1c153c078a 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -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; |