diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 08:14:59 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 08:14:59 +0000 |
| commit | ac463d2697d3beb50fd24bbf48f818724f5220f6 (patch) | |
| tree | e77267cdd463c269c8fb7bbefda18517ed363cbb /plugins | |
| parent | 6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (diff) | |
| download | wireshark-ac463d2697d3beb50fd24bbf48f818724f5220f6.tar.gz wireshark-ac463d2697d3beb50fd24bbf48f818724f5220f6.tar.bz2 wireshark-ac463d2697d3beb50fd24bbf48f818724f5220f6.zip | |
Don't guard col_clear with col_check
svn path=/trunk/; revision=29346
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ethercat/packet-ethercat-frame.c | 5 | ||||
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 5 | ||||
| -rw-r--r-- | plugins/profinet/packet-pn-mrp.c | 4 | ||||
| -rw-r--r-- | plugins/unistim/packet-unistim.c | 4 | ||||
| -rw-r--r-- | plugins/wimax/packet-wmx.c | 5 | ||||
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 5 |
6 files changed, 6 insertions, 22 deletions
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 |