Remove check_col() and the occasional tree.

This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory.  A small handful of check_col() calls remain outside of the dissectors.

svn path=/trunk/; revision=49941

1 files changed, 11 insertions, 22 deletions

diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 4c2fe24e2f..946b9fb1de 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -733,27 +733,18 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                     call_dissector(wsp_handle, wsp_tvb, pinfo, tree);
                 } else {
                     /* Not reassembled in this packet */
-                    if (check_col(pinfo->cinfo, COL_INFO)) {
-                        col_append_fstr(pinfo->cinfo, COL_INFO,
-                                "%s (WTP payload reassembled in packet %u)",
-                                szInfo, fd_wtp->reassembled_in);
-                    }
-                    if (tree) {
-                        proto_tree_add_text(wtp_tree, tvb, dataOffset, -1,
-                                "Payload");
-                    }
+                    col_append_fstr(pinfo->cinfo, COL_INFO,
+                            "%s (WTP payload reassembled in packet %u)",
+                            szInfo, fd_wtp->reassembled_in);
+
+                    proto_tree_add_text(wtp_tree, tvb, dataOffset, -1, "Payload");
                 }
             } else {
                 /* Not reassembled yet, or not reassembled at all */
-                if (check_col(pinfo->cinfo, COL_INFO)) {
-                    col_append_fstr(pinfo->cinfo, COL_INFO,
-                            "%s (Unreassembled fragment %u)",
-                            szInfo, psn);
-                }
-                if (tree) {
-                    proto_tree_add_text(wtp_tree, tvb, dataOffset, -1,
-                            "Payload");
-                }
+                col_append_fstr(pinfo->cinfo, COL_INFO,
+                        "%s (Unreassembled fragment %u)",
+                        szInfo, psn);
+                proto_tree_add_text(wtp_tree, tvb, dataOffset, -1, "Payload");
             }
             /* Now reset fragmentation information in pinfo */
             pinfo->fragmented = save_fragmented;
@@ -768,15 +759,13 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         else
         {
             /* Nothing to hand to subdissector */
-            if (check_col(pinfo->cinfo, COL_INFO))
-                col_append_str(pinfo->cinfo, COL_INFO, szInfo);
+            col_append_str(pinfo->cinfo, COL_INFO, szInfo);
         }
     }
     else
     {
         /* Nothing to hand to subdissector */
-        if (check_col(pinfo->cinfo, COL_INFO))
-            col_append_str(pinfo->cinfo, COL_INFO, szInfo);
+        col_append_str(pinfo->cinfo, COL_INFO, szInfo);
     }
 }