diff options
63 files changed, 70 insertions, 222 deletions
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 1894e8ba4f..ec812bad11 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -165,9 +165,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * if (check_col(pinfo->cinfo, COL_PROTOCOL)){ col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS"); tr=proto_item_add_subtree(it, ett_h225); diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index 36dc6c01d6..77a5b781a9 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -62,9 +62,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) gint32 tag; col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), FALSE); tree = proto_item_add_subtree(item, ett_t125); diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index d3345e41e2..d3cca47b22 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -513,9 +513,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); primary_part = TRUE; @@ -560,9 +558,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 ifp_packet_number=1; col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); primary_part = TRUE; diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index f5d190b059..d209d427dc 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -1424,9 +1424,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFS (RX)"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); reply = (rxinfo->flags & RX_CLIENT_INITIATED) == 0; port = ((reply == 0) ? pinfo->destport : pinfo->srcport ); diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 2c5da98b22..1d06064165 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -1093,9 +1093,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset; col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMQP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index c76fa241a7..2265db4c7a 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -1367,9 +1367,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "ARTNET"); /* Clear out stuff in the info column */ - if(check_col(pinfo->cinfo,COL_INFO)){ - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_artnet, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 5ee938020f..648376982c 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -313,9 +313,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "STP"); /* Spanning Tree Protocol */ } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE); diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index 709d5be567..2536993120 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -1474,9 +1474,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFM"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo,COL_INFO)) { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* provide info column with CFM packet type (opcode)*/ cfm_pdu_type = tvb_get_guint8(tvb, 1); diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index 98ab58e9e3..35fd516a5c 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -1005,9 +1005,7 @@ dissect_ctdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTDB"); - if(check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if(parent_tree){ item=proto_tree_add_item(parent_tree, proto_ctdb, tvb, offset, diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 2e2c111027..7cfec3a7e5 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -183,9 +183,7 @@ dissect_dcp_etsi (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) pinfo->current_proto = "DCP (ETSI)"; /* Clear out stuff in the info column */ - if (check_col (pinfo->cinfo, COL_INFO)) { - col_clear (pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (check_col (pinfo->cinfo, COL_PROTOCOL)) { col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP (ETSI)"); /*col_append_fstr (pinfo->cinfo, COL_INFO, " tvb %d", tvb_length(tvb));*/ diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index 2a1388c881..a66d54729e 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -119,9 +119,7 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *sep; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC_STP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE); diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index b1905076e4..ec99297f0e 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -378,13 +378,9 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char *addr; offset = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_clear(pinfo->cinfo, COL_PROTOCOL); - } + col_clear(pinfo->cinfo, COL_PROTOCOL); col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC DNA"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); set_dnet_address(&pinfo->dl_src, &pinfo->net_src); set_dnet_address(&pinfo->dl_src, &pinfo->src); diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 391dc48d7d..66800aaba2 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1886,10 +1886,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT"); /* Clear out stuff in the info column */ - if(check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if(tree) { proto_item *ti =NULL; diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 7193d31ba2..2303fc2e14 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -1039,10 +1039,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); /* Clear out stuff in the info column */ - if(check_col(pinfo->cinfo,COL_INFO)) - { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if(check_col(pinfo->cinfo,COL_INFO)) { diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index cfd2e72870..a56f1a7c01 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -704,9 +704,7 @@ dissect_dvmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of col_set_str(pinfo->cinfo, COL_PROTOCOL, "DVMRP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if ((tvb_length_remaining(tvb, offset)>=8) diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index 5d21b3c0bd..1db73cf98c 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -305,9 +305,7 @@ dissect_epl_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; } - if(check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if(check_col(pinfo->cinfo, COL_INFO)){ diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 3e0c367ee4..e7d0b41fa8 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -235,9 +235,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "FIX"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* get at least the fix version: 8=FIX.x.x */ if (fix_marker(tvb, 0) != 0) { diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 0a698bf518..1b215ca077 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -7501,9 +7501,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * if (check_col(pinfo->cinfo, COL_PROTOCOL)){ col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS"); tr=proto_item_add_subtree(it, ett_h225); diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 0f5520093e..bceb3136fa 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1013,10 +1013,7 @@ dissect_iax2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { col_set_str (pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_IAX2); } - if (check_col (pinfo->cinfo, COL_INFO)) - { - col_clear (pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* add the 'iax2' tree to the main tree */ if (tree) diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index db6f76b850..e24c2f8e8b 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -1729,9 +1729,7 @@ dissect_icq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; /* This is not a (recognized) ICQ packet */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQ"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); version = tvb_get_letohs(tvb, ICQ_VERSION); switch (version) { diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index d00e4f4b08..77fa6b1332 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -428,9 +428,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); asduh = ep_alloc(sizeof(struct asduheader)); res = ep_strbuf_new_label(NULL); @@ -521,9 +519,7 @@ static void dissect_iec104apci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); apcih = ep_alloc(sizeof(struct apciheader)); diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index 16906c93f8..11d8a9b576 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.c @@ -92,9 +92,7 @@ dissect_ieee802a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int hf; col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE802a"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_ieee802a, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 9565a06da3..533252cb33 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -147,9 +147,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off tree = proto_item_add_subtree(item, ett_igap); col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGAP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); type = tvb_get_guint8(tvb, offset); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index affaf6fae8..5609c8c403 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -910,9 +910,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGMP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); type = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index c83b8333bd..c21308ae1c 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -108,9 +108,7 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPVS"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); cnt = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_conn_count, tvb, offset, 1, FALSE); diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index e2572575c3..c49fb01c32 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -84,9 +84,7 @@ static void dissect_kdp(tvbuff_t *tvb, int offset; col_set_str(pinfo->cinfo, COL_PROTOCOL, "KDP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { proto_item *ti; proto_tree *kdp_tree, *flags_tree; diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index e994d72d25..06e6d41ec3 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -419,9 +419,7 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 format, types, wsize; col_set_str(pinfo->cinfo, COL_PROTOCOL, "XID"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); format = tvb_get_guint8(tvb, 0); if (tree) { @@ -469,9 +467,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); dsap = tvb_get_guint8(tvb, 0); if (tree) { diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 127319a11c..bcc1c9d152 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -2468,9 +2468,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLDP"); /* Clear the information column on summary display */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index 05b34d7a4e..2105ac6d3a 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -204,9 +204,7 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int o col_set_str(pinfo->cinfo, COL_PROTOCOL, "MRDISC"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); type = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c index 6ee5ac4ed3..038409d891 100644 --- a/epan/dissectors/packet-msnip.c +++ b/epan/dissectors/packet-msnip.c @@ -234,9 +234,7 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSNIP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); type = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 087a73a163..e1e0e2df8c 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -193,9 +193,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBD"); - if(check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); item = proto_tree_add_item(parent_tree, proto_nbd, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_nbd); diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index f4fb7c1287..89a5057f57 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3232,9 +3232,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_writable(pinfo->cinfo, TRUE); col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ndmp_item = proto_tree_add_item(tree, proto_ndmp, tvb, 0, -1, FALSE); ndmp_tree = proto_item_add_subtree(ndmp_item, ett_ndmp); diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c index 8794970dc2..f01b5a2465 100644 --- a/epan/dissectors/packet-netdump.c +++ b/epan/dissectors/packet-netdump.c @@ -101,9 +101,7 @@ dissect_netdump(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Netdump"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo,COL_INFO)) { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { /* we are being asked for details */ proto_item *ti = NULL; diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index e3ceef7af0..8c1abbffa7 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -841,9 +841,7 @@ void dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) oui_info_t *oui_info; col_set_str(pinfo->cinfo, COL_PROTOCOL, "NHRP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); memset(&hdr, 0, sizeof(e_nhrp_hdr)); diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c index d464fb3515..683112fb56 100644 --- a/epan/dissectors/packet-omapi.c +++ b/epan/dissectors/packet-omapi.c @@ -110,10 +110,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "OMAPI"); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree, proto_omapi, tvb, 0, -1, FALSE); omapi_tree = proto_item_add_subtree(ti, ett_omapi); diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index 37deb42041..315690200c 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -199,9 +199,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PAGP"); /* PAGP Protocol */ } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); pinfo->current_proto = "PAGP"; diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index b161a80dcf..7792e3e7dc 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -426,10 +426,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoED"); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* Start Decoding Here. */ pppoe_code = tvb_get_guint8(tvb, 1); @@ -677,10 +674,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoES"); - if (check_col(pinfo->cinfo,COL_INFO)) - { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* Start Decoding Here. */ pppoe_code = tvb_get_guint8(tvb, 1); diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 9664a5c259..9d56ee89b5 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -303,10 +303,7 @@ static void dissect_rdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set/clear columns */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDT"); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* Create RDT protocol tree */ if (tree) diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index 0ae81215f8..5233643e97 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -66,9 +66,7 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const guint8 *bridge_mac_str; col_set_str(pinfo->cinfo, COL_PROTOCOL, "R-STP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); bridge_mac_str = tvb_get_ptr(tvb, 10, 6); if (check_col(pinfo->cinfo, COL_INFO)){ col_add_fstr(pinfo->cinfo, COL_INFO, "Bridge MAC %s", ether_to_str(bridge_mac_str)); diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c index 146f087484..0a550a4899 100644 --- a/epan/dissectors/packet-rgmp.c +++ b/epan/dissectors/packet-rgmp.c @@ -78,9 +78,7 @@ dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off tree = proto_item_add_subtree(item, ett_rgmp); col_set_str(pinfo->cinfo, COL_PROTOCOL, "RGMP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); type = tvb_get_guint8(tvb, offset); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index e9088a388c..bfeab73a6d 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -108,9 +108,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); type = tvb_get_guint8(tvb, 0); diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index 83bbc380b0..f759520cb9 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -679,9 +679,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTcfg"); /* Clear out stuff in the info column */ - if(check_col(pinfo->cinfo,COL_INFO)){ - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_rtcfg, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 3f84d62102..677f35e576 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -5593,9 +5593,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, /* --- Make entries in Protocol column ---*/ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index c0571abba9..2f624119dd 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -8182,9 +8182,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, /* --- Make entries in Protocol column ---*/ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS2"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* Check if is NDDSPING */ { diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c index f2ce069da0..60204940ca 100644 --- a/epan/dissectors/packet-s5066.c +++ b/epan/dissectors/packet-s5066.c @@ -1301,9 +1301,7 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "S5066"); /* Clear out stuff in the info column, the add PDU type */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)")); } diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 7bd9a17866..d1f05911bc 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -572,9 +572,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr guint32 uptime; col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); cmd = tvb_get_guint8(tvb, offset); @@ -815,9 +813,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr guint namelen; col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); cmd = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index 25cdfe5348..94f528d99e 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -107,9 +107,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, return TRUE; } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); smb_info = pinfo->private_data; if (smb_info->sip != NULL && smb_info->sip->extra_info_type == SMB_EI_TRI) diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 05468fc6d6..f59d63a565 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -16262,9 +16262,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) top_tree=parent_tree; col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* start off using the local variable, we will allocate a new one if we need to*/ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 32e2e67e57..82d4f6c2a1 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -2135,9 +2135,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) gint32 tag; col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), FALSE); tree = proto_item_add_subtree(item, ett_t125); diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 435d104438..80a152d603 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -1094,9 +1094,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); primary_part = TRUE; @@ -1141,9 +1139,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 ifp_packet_number=1; col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); primary_part = TRUE; diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 32cdc65a30..83f6ea3cb2 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -708,9 +708,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_data = ts2_get_conversation(pinfo); col_set_str(pinfo->cinfo, COL_PROTOCOL, "TS2"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo,COL_INFO)) { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (check_col(pinfo->cinfo, COL_INFO)) { if(class==TS2C_ACK) diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 934acf86e4..165b9ccd99 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -211,9 +211,7 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCCP"); - if(check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if(check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index d13e65f83e..cbc8cebe60 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -642,9 +642,7 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) enum wrepl_mess_type mess_type; col_set_str(pinfo->cinfo, COL_PROTOCOL, "WINS-Replication"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (parent_tree) { winsrepl_item = proto_tree_add_item(parent_tree, proto_winsrepl, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 48595ffc3d..afa077dbff 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -5469,10 +5469,7 @@ dissect_wsp_fromwap_cl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * XXX - what about WTLS->WSP? */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); dissect_wsp_common(tvb, pinfo, tree, wtp_fromudp_handle, TRUE); } diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c index 885aed19d8..6ce56d7d05 100644 --- a/epan/dissectors/packet-x224.c +++ b/epan/dissectors/packet-x224.c @@ -180,9 +180,7 @@ dissect_x224(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) x224_conv_info_t *x224_info; col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.224"); - if (check_col(pinfo->cinfo, COL_INFO)){ - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); length = tvb_get_guint8(tvb, offset); if (parent_tree) { diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index e2041fd51c..d4b2c9a146 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -368,9 +368,7 @@ dissect_zbee_nwk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Add ourself to the protocol column, clear the info column, and create the protocol tree. */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { proto_root = proto_tree_add_protocol_format(tree, proto_zbee_nwk, tvb, offset, tvb_length(tvb), "ZigBee Network Layer"); nwk_tree = proto_item_add_subtree(proto_root, ett_zbee_nwk); diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index c749fd194b..f5a866e829 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -558,9 +558,7 @@ static void dissect_zbee_zcl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } /* Clear info column */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* Get the FCF */ fcf = tvb_get_guint8(tvb, offset); diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index 8e8c0be533..b3ce57f186 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -84,10 +84,7 @@ static void dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECATF"); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index 564f49f7f5..dc8a540d14 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -186,10 +186,7 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); { /* we are being asked for details */ diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index 0486f92492..2f03ef73d6 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -394,9 +394,7 @@ dissect_PNMRP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-MRP"); /* Clear the information column on summary display */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); if (tree) { diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index 1a7799ab86..137e117acb 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -1545,9 +1545,7 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree){ size=tvb_length_remaining(tvb, offset); col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNISTIM"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo,COL_INFO)) { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree,proto_unistim,tvb,offset,-1,FALSE); overall_unistim_tree = proto_item_add_subtree(ti,ett_unistim); ti1=proto_tree_add_text(overall_unistim_tree,tvb,offset,5,"Reliable UDP"); diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c index 9beffdf051..9866c8ec41 100644 --- a/plugins/wimax/packet-wmx.c +++ b/plugins/wimax/packet-wmx.c @@ -794,10 +794,7 @@ static void dissect_wimax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* display the WiMax protocol name */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); } gboolean is_down_link(address *src_address) diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index 375765eabd..cdb56b3a20 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -2004,10 +2004,7 @@ dissect_wimaxasncp( /* We'll fill in the "Info" column after fetch data, so we clear the column first in case calls to fetch data from the packet throw an exception. */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* ======================================================================== * Disesction starts here |