Remove check_col() and the occasional tree.

svn path=/trunk/; revision=49923

1 files changed, 18 insertions, 30 deletions

diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 8b83708ec7..fa5f332cb9 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -5048,14 +5048,11 @@ dissect_scsi_rsp(tvbuff_t *tvb, packet_info *pinfo,
 
     ti = proto_tree_add_uint(scsi_tree, hf_scsi_status, tvb, 0, 0, scsi_status);
     PROTO_ITEM_SET_GENERATED(ti);
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: Response LUN: 0x%02x (%s) (%s)", itlq->lun,
+    col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: Response LUN: 0x%02x (%s) (%s)", itlq->lun,
                      val_to_str(itlq->scsi_opcode, csdata->cdb_vals, "CDB:0x%02x"),
                      val_to_str(scsi_status, scsi_status_val, "Unknown (0x%08x)"));
 
-        col_set_fence(pinfo->cinfo, COL_INFO);
-    }
-
+    col_set_fence(pinfo->cinfo, COL_INFO);
 }
 
 void
@@ -5086,11 +5083,9 @@ dissect_scsi_snsinfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     ti = proto_tree_add_uint(sns_tree, hf_scsi_lun, tvb, 0, 0, itlq->lun);
     PROTO_ITEM_SET_GENERATED(ti);
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_append_fstr(pinfo->cinfo, COL_INFO, " LUN:0x%02x ", itlq->lun);
+    col_append_fstr(pinfo->cinfo, COL_INFO, " LUN:0x%02x ", itlq->lun);
 
-        col_set_fence(pinfo->cinfo, COL_INFO);
-    }
+    col_set_fence(pinfo->cinfo, COL_INFO);
 
     dissect_scsi_sense(tvb, sns_tree, offset);
 
@@ -5406,15 +5401,13 @@ dissect_scsi_cdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         valstr = try_val_to_str(opcode, csdata->cdb_vals);
     }
 
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        if (valstr != NULL) {
-            col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: %s LUN: 0x%02x ", valstr, itlq->lun);
-        } else {
-            col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI Command: 0x%02x LUN:0x%02x ", opcode, itlq->lun);
-        }
-        /* make sure no one will overwrite this in the info column */
-        col_set_fence(pinfo->cinfo, COL_INFO);
+    if (valstr != NULL) {
+        col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: %s LUN: 0x%02x ", valstr, itlq->lun);
+    } else {
+        col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI Command: 0x%02x LUN:0x%02x ", opcode, itlq->lun);
     }
+    /* make sure no one will overwrite this in the info column */
+    col_set_fence(pinfo->cinfo, COL_INFO);
 
     cdata = ep_new(scsi_task_data_t);
     cdata->itl = itl;
@@ -5521,17 +5514,14 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         scsi_tree = proto_item_add_subtree(ti, ett_scsi);
     }
 
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_add_fstr(pinfo->cinfo, COL_INFO,
-                     "SCSI: Data %s LUN: 0x%02x (%s %s) ",
-                     isreq ? "Out" : "In",
-                     itlq->lun,
-                     val_to_str(opcode, csdata->cdb_vals, "0x%02x"),
-                     isreq ? "Request Data" : "Response Data");
-
-        col_set_fence(pinfo->cinfo, COL_INFO);
-    }
+    col_add_fstr(pinfo->cinfo, COL_INFO,
+                    "SCSI: Data %s LUN: 0x%02x (%s %s) ",
+                    isreq ? "Out" : "In",
+                    itlq->lun,
+                    val_to_str(opcode, csdata->cdb_vals, "0x%02x"),
+                    isreq ? "Request Data" : "Response Data");
 
+    col_set_fence(pinfo->cinfo, COL_INFO);
 
     ti = proto_tree_add_uint(scsi_tree, hf_scsi_lun, tvb, 0, 0, itlq->lun);
     PROTO_ITEM_SET_GENERATED(ti);
@@ -5633,10 +5623,8 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled SCSI DATA", ipfd_head, &scsi_frag_items, &update_col_info, tree);
 
     if ( ipfd_head && (ipfd_head->reassembled_in != pinfo->fd->num) ) {
-        if (check_col(pinfo->cinfo, COL_INFO)) {
-            col_prepend_fstr(pinfo->cinfo, COL_INFO, "[Reassembled in #%u] ",
+        col_prepend_fstr(pinfo->cinfo, COL_INFO, "[Reassembled in #%u] ",
                              ipfd_head->reassembled_in);
-        }
     }