Get rid of check_col, while at it set ENC.

svn path=/trunk/; revision=39149

1 files changed, 36 insertions, 38 deletions

diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index d60836182b..473ebaec6b 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -193,7 +193,7 @@ dissect_dcp_etsi (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if(tree) {
     proto_item *ti = NULL;
-    ti = proto_tree_add_item (tree, proto_dcp_etsi, tvb, 0, -1, FALSE);
+    ti = proto_tree_add_item (tree, proto_dcp_etsi, tvb, 0, -1, ENC_BIG_ENDIAN);
     dcp_tree = proto_item_add_subtree (ti, ett_edcp);
   }
 
@@ -409,23 +409,21 @@ dissect_pft_fragmented(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                                         frag_edcp, &dcp_frag_items,
                                         NULL, tree);
   }
-  if (check_col (pinfo->cinfo, COL_INFO)) {
-    if(new_tvb) {
-      col_append_str (pinfo->cinfo, COL_INFO, " (Message Reassembled)");
+  if(new_tvb) {
+    col_append_str (pinfo->cinfo, COL_INFO, " (Message Reassembled)");
+  } else {
+    if(last) {
+      col_append_str (pinfo->cinfo, COL_INFO, " (Message Reassembly failure)");
     } else {
-      if(last) {
-        col_append_str (pinfo->cinfo, COL_INFO, " (Message Reassembly failure)");
-      } else {
-        col_append_fstr (pinfo->cinfo, COL_INFO, " (Message fragment %u)", findex);
-      }
+      col_append_fstr (pinfo->cinfo, COL_INFO, " (Message fragment %u)", findex);
     }
-    if(first)
-      col_append_str (pinfo->cinfo, COL_INFO, " (first)");
-    if(last)
-      col_append_str (pinfo->cinfo, COL_INFO, " (last)");
   }
+  if(first)
+    col_append_str (pinfo->cinfo, COL_INFO, " (first)");
+  if(last)
+   col_append_str (pinfo->cinfo, COL_INFO, " (last)");
   return new_tvb;
-}
+  }
 
 /** Dissect a PFT packet. Details follow
  *  here.
@@ -450,51 +448,51 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-PFT");
 
   if (tree) {                   /* we are being asked for details */
-    ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, FALSE);
+    ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, ENC_BIG_ENDIAN);
     pft_tree = proto_item_add_subtree (ti, ett_pft);
-    proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, FALSE);
+    proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, ENC_BIG_ENDIAN);
   }
   offset += 2;
   seq = tvb_get_ntohs (tvb, offset);
   if (tree) {
-    proto_tree_add_item (pft_tree, hf_edcp_pseq, tvb, offset, 2, FALSE);
+    proto_tree_add_item (pft_tree, hf_edcp_pseq, tvb, offset, 2, ENC_BIG_ENDIAN);
   }
   offset += 2;
   findex = tvb_get_ntoh24 (tvb, offset);
   if (tree) {
-    proto_tree_add_item (pft_tree, hf_edcp_findex, tvb, offset, 3, FALSE);
+    proto_tree_add_item (pft_tree, hf_edcp_findex, tvb, offset, 3, ENC_BIG_ENDIAN);
   }
   offset += 3;
   fcount = tvb_get_ntoh24 (tvb, offset);
   if (tree) {
-    proto_tree_add_item (pft_tree, hf_edcp_fcount, tvb, offset, 3, FALSE);
+    proto_tree_add_item (pft_tree, hf_edcp_fcount, tvb, offset, 3, ENC_BIG_ENDIAN);
   }
   offset += 3;
   plen = tvb_get_ntohs (tvb, offset);
   payload_len = plen & 0x3fff;
   if (tree) {
-    proto_tree_add_item (pft_tree, hf_edcp_fecflag, tvb, offset, 2, FALSE);
-    proto_tree_add_item (pft_tree, hf_edcp_addrflag, tvb, offset, 2, FALSE);
-    li = proto_tree_add_item (pft_tree, hf_edcp_plen, tvb, offset, 2, FALSE);
+    proto_tree_add_item (pft_tree, hf_edcp_fecflag, tvb, offset, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_item (pft_tree, hf_edcp_addrflag, tvb, offset, 2, ENC_BIG_ENDIAN);
+    li = proto_tree_add_item (pft_tree, hf_edcp_plen, tvb, offset, 2, ENC_BIG_ENDIAN);
   }
   offset += 2;
   if (plen & 0x8000) {
     fec = TRUE;
     rsk = tvb_get_guint8 (tvb, offset);
     if (tree)
-          proto_tree_add_item (pft_tree, hf_edcp_rsk, tvb, offset, 1, FALSE);
+          proto_tree_add_item (pft_tree, hf_edcp_rsk, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
     rsz = tvb_get_guint8 (tvb, offset);
     if (tree)
-          proto_tree_add_item (pft_tree, hf_edcp_rsz, tvb, offset, 1, FALSE);
+          proto_tree_add_item (pft_tree, hf_edcp_rsz, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
   }
   if (plen & 0x4000) {
     if (tree)
-      proto_tree_add_item (pft_tree, hf_edcp_source, tvb, offset, 2, FALSE);
+      proto_tree_add_item (pft_tree, hf_edcp_source, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset += 2;
     if (tree)
-          proto_tree_add_item (pft_tree, hf_edcp_dest, tvb, offset, 2, FALSE);
+          proto_tree_add_item (pft_tree, hf_edcp_dest, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset += 2;
   }
   if (tree) {
@@ -502,7 +500,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
     guint header_len = offset+2;
     const char *crc_buf = (const char *) tvb_get_ptr(tvb, 0, header_len);
     unsigned long c = crc_drm(crc_buf, header_len, 16, 0x11021, 1);
-    ci = proto_tree_add_item (pft_tree, hf_edcp_hcrc, tvb, offset, 2, FALSE);
+    ci = proto_tree_add_item (pft_tree, hf_edcp_hcrc, tvb, offset, 2, ENC_BIG_ENDIAN);
     proto_item_append_text(ci, " (%s)", (c==0xe2f0)?"Ok":"bad");
     proto_tree_add_boolean(pft_tree, hf_edcp_hcrc_ok, tvb, offset, 2, c==0xe2f0);
   }
@@ -510,7 +508,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   if (fcount > 1) {             /* fragmented*/
     gboolean save_fragmented = pinfo->fragmented;
     guint16 real_len = tvb_length(tvb)-offset;
-    proto_tree_add_item (pft_tree, hf_edcp_pft_payload, tvb, offset, real_len, FALSE);
+    proto_tree_add_item (pft_tree, hf_edcp_pft_payload, tvb, offset, real_len, ENC_BIG_ENDIAN);
     if(real_len != payload_len) {
       if(li)
         proto_item_append_text(li, " (length error (%d))", real_len);
@@ -552,15 +550,15 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-AF");
 
   if (tree) {                   /* we are being asked for details */
-    ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, FALSE);
+    ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, ENC_BIG_ENDIAN);
     af_tree = proto_item_add_subtree (ti, ett_af);
-    proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, FALSE);
+    proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, ENC_BIG_ENDIAN);
   }
   offset += 2;
   payload_len = tvb_get_ntohl(tvb, offset);
   if (tree) {
     guint32 real_payload_len = tvb_length(tvb)-12;
-    li = proto_tree_add_item (af_tree, hf_edcp_len, tvb, offset, 4, FALSE);
+    li = proto_tree_add_item (af_tree, hf_edcp_len, tvb, offset, 4, ENC_BIG_ENDIAN);
     if(real_payload_len < payload_len) {
       proto_item_append_text (li, " (wrong len claims %d is %d)",
       payload_len, real_payload_len
@@ -573,23 +571,23 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   }
   offset += 4;
   if (tree)
-    proto_tree_add_item (af_tree, hf_edcp_seq, tvb, offset, 2, FALSE);
+    proto_tree_add_item (af_tree, hf_edcp_seq, tvb, offset, 2, ENC_BIG_ENDIAN);
   offset += 2;
   ver = tvb_get_guint8 (tvb, offset);
   if (tree) {
-    proto_tree_add_item (af_tree, hf_edcp_crcflag, tvb, offset, 1, FALSE);
-    proto_tree_add_item (af_tree, hf_edcp_maj, tvb, offset, 1, FALSE);
-    proto_tree_add_item (af_tree, hf_edcp_min, tvb, offset, 1, FALSE);
+    proto_tree_add_item (af_tree, hf_edcp_crcflag, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (af_tree, hf_edcp_maj, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (af_tree, hf_edcp_min, tvb, offset, 1, ENC_BIG_ENDIAN);
   }
   offset += 1;
   pt = tvb_get_guint8 (tvb, offset);
   if (tree)
-    proto_tree_add_item (af_tree, hf_edcp_pt, tvb, offset, 1, FALSE);
+    proto_tree_add_item (af_tree, hf_edcp_pt, tvb, offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
   next_tvb = tvb_new_subset (tvb, offset, payload_len, -1);
   offset += payload_len;
   if (tree)
-    ci = proto_tree_add_item (af_tree, hf_edcp_crc, tvb, offset, 2, FALSE);
+    ci = proto_tree_add_item (af_tree, hf_edcp_crc, tvb, offset, 2, ENC_BIG_ENDIAN);
   if (ver & 0x80) { /* crc valid */
     guint len = offset+2;
     const char *crc_buf = (const char *) tvb_get_ptr(tvb, 0, len);
@@ -626,7 +624,7 @@ dissect_tpl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if(tree) {
     proto_item *ti = NULL;
-    ti = proto_tree_add_item (tree, proto_tpl, tvb, 0, -1, FALSE);
+    ti = proto_tree_add_item (tree, proto_tpl, tvb, 0, -1, ENC_BIG_ENDIAN);
     tpl_tree = proto_item_add_subtree (ti, ett_tpl);
   }
   while(offset<tvb_length(tvb)) {