Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:

     FT_NONE
     FT_BYTES
     FT_IPV6
     FT_IPXNET
     FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
 

svn path=/trunk/; revision=39263

12 files changed, 358 insertions, 358 deletions

diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c
index 649d3bde4e..089695ff09 100644
--- a/asn1/mpeg-audio/packet-mpeg-audio-template.c
+++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c
@@ -96,12 +96,12 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		unsigned int padding;
 
 		proto_tree_add_item(tree, hf_mpeg_audio_data, tvb,
-				offset / 8, data_size, FALSE);
+				offset / 8, data_size, ENC_NA);
 		offset += data_size * 8;
 		padding = mpa_padding(&mpa);
 		if (padding > 0) {
 			proto_tree_add_item(tree, hf_mpeg_audio_padbytes, tvb,
-					offset / 8, padding, FALSE);
+					offset / 8, padding, ENC_NA);
 			offset += padding * 8;
 		}
 	}
@@ -128,7 +128,7 @@ dissect_id3v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2");
 	col_clear(pinfo->cinfo, COL_INFO);
 	proto_tree_add_item(tree, hf_id3v2, tvb,
-			0, -1, FALSE);
+			0, -1, ENC_NA);
 }
 
 static gboolean
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c
index 3e24b92ef2..656e74b089 100644
--- a/asn1/mpeg-pes/packet-mpeg-pes-template.c
+++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c
@@ -198,7 +198,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
 		proto_tree *root, unsigned flags)
 {
 	proto_item *item = proto_tree_add_item(root, hf_mpeg_pes_header_data, tvb,
-			0, -1, FALSE);
+			0, -1, ENC_NA);
 	proto_tree *tree = proto_item_add_subtree(item, ett_mpeg_pes_header_data);
 
 	gint offset = 0;
@@ -252,7 +252,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
 
 		trick_item = proto_tree_add_item(item,
 			hf_mpeg_pes_dsm_trick_mode, tvb,
-				offset, 1, FALSE);
+				offset, 1, ENC_NA);
 
 		trick_tree = proto_item_add_subtree(trick_item,
 			ett_mpeg_pes_trick_mode);
@@ -352,7 +352,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, gint offset,
 	unsigned program_mux_rate, stuffing_length;
 
 	proto_item *item = proto_tree_add_item(root, hf_mpeg_pes_pack_header, tvb,
-			offset / 8, 10, FALSE);
+			offset / 8, 10, ENC_NA);
 	proto_tree *tree = proto_item_add_subtree(item, ett_mpeg_pes_pack_header);
 
 	nstime_t nst;
@@ -377,7 +377,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, gint offset,
 
 	if (stuffing_length > 0) {
 		proto_tree_add_item(tree, hf_mpeg_pes_stuffing, tvb,
-				offset / 8, stuffing_length, FALSE);
+				offset / 8, stuffing_length, ENC_NA);
 		offset += stuffing_length * 8;
 	}
 
@@ -433,7 +433,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		offset = dissect_mpeg_pes_Picture(tvb, offset, &asn1_ctx,
 				tree, hf_mpeg_video_picture);
 		proto_tree_add_item(tree, hf_mpeg_video_data, tvb,
-				offset / 8, -1, FALSE);
+				offset / 8, -1, ENC_NA);
 	} else if (stream == STREAM_SEQUENCE) {
 		tvbuff_t *es;
 
@@ -441,7 +441,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				tree, hf_mpeg_video_sequence_header);
 
 		proto_tree_add_item(tree, hf_mpeg_video_quantization_matrix, tvb,
-				offset / 8, 64, FALSE);
+				offset / 8, 64, ENC_NA);
 		offset += 64 * 8;
 
 		es = tvb_new_subset_remaining(tvb, offset / 8);
@@ -467,7 +467,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			offset = dissect_mpeg_pes_pack_header(tvb, offset, pinfo, tree);
 		} else {
 			proto_tree_add_item(tree, hf_mpeg_pes_data, tvb,
-					offset / 8, 8, FALSE);
+					offset / 8, 8, ENC_NA);
 			offset += 8 * 8;
 		}
 	} else if (stream == STREAM_SYSTEM || stream == STREAM_PRIVATE2) {
@@ -477,7 +477,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		offset += 2 * 8;
 
 		proto_tree_add_item(tree, hf_mpeg_pes_data, tvb,
-				offset / 8, data_length, FALSE);
+				offset / 8, data_length, ENC_NA);
 	} else if (stream == STREAM_PADDING) {
 		unsigned padding_length = tvb_get_ntohs(tvb, offset / 8);
 		proto_tree_add_item(tree, hf_mpeg_pes_length, tvb,
@@ -485,7 +485,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		offset += 2 * 8;
 
 		proto_tree_add_item(tree, hf_mpeg_pes_padding, tvb,
-				offset / 8, padding_length, FALSE);
+				offset / 8, padding_length, ENC_NA);
 	} else if (stream == STREAM_PRIVATE1
 			|| stream >= STREAM_AUDIO) {
 		int length = tvb_get_ntohs(tvb, 4);
@@ -521,7 +521,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 			/* length may be zero for Video stream */
 			if(length==0){
-				proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, (offset>>3),-1, FALSE);
+				proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, (offset>>3),-1, ENC_NA);
 				return TRUE;
 			}
 
@@ -532,7 +532,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				dissect_mpeg(es, pinfo, tree);
 			else
 				proto_tree_add_item(tree, hf_mpeg_pes_data, es,
-						0, -1, FALSE);
+						0, -1, ENC_NA);
 		} else {
 			unsigned data_length = tvb_get_ntohs(tvb, offset / 8);
 			proto_tree_add_item(tree, hf_mpeg_pes_length, tvb,
@@ -540,11 +540,11 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			offset += 2 * 8;
 
 			proto_tree_add_item(tree, hf_mpeg_pes_data, tvb,
-					offset / 8, data_length, FALSE);
+					offset / 8, data_length, ENC_NA);
 		}
 	} else {
 		proto_tree_add_item(tree, hf_mpeg_pes_data, tvb,
-				offset / 8, -1, FALSE);
+				offset / 8, -1, ENC_NA);
 	}
 	return TRUE;
 }
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index 106a185be5..c80225fa35 100644
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -144,128 +144,128 @@ static const value_string qsig_str_service_name[] = {
 
 #define NO_SRV (-1)
 static const gint32 op2srv_tab[] = {
-  /*   0 */ 13868, 
-  /*   1 */ 13868, 
-  /*   2 */ 13868, 
-  /*   3 */ 13868, 
-  /*   4 */ 13874, 
-  /*   5 */ 13874, 
-  /*   6 */ 13874, 
-  /*   7 */ 13869, 
-  /*   8 */ 13869, 
-  /*   9 */ 13869, 
-  /*  10 */ 13869, 
-  /*  11 */ 13869, 
-  /*  12 */ 13869, 
-  /*  13 */ 13869, 
-  /*  14 */ 13869, 
-  /*  15 */ 13873, 
-  /*  16 */ 13873, 
-  /*  17 */ 13873, 
-  /*  18 */ 13873, 
-  /*  19 */ 13873, 
-  /*  20 */ 13873, 
-  /*  21 */ 13873, 
-  /*  22 */ 13873, 
-  /*  23 */ 13873, 
+  /*   0 */ 13868,
+  /*   1 */ 13868,
+  /*   2 */ 13868,
+  /*   3 */ 13868,
+  /*   4 */ 13874,
+  /*   5 */ 13874,
+  /*   6 */ 13874,
+  /*   7 */ 13869,
+  /*   8 */ 13869,
+  /*   9 */ 13869,
+  /*  10 */ 13869,
+  /*  11 */ 13869,
+  /*  12 */ 13869,
+  /*  13 */ 13869,
+  /*  14 */ 13869,
+  /*  15 */ 13873,
+  /*  16 */ 13873,
+  /*  17 */ 13873,
+  /*  18 */ 13873,
+  /*  19 */ 13873,
+  /*  20 */ 13873,
+  /*  21 */ 13873,
+  /*  22 */ 13873,
+  /*  23 */ 13873,
   /*  24 */ NO_SRV,
   /*  25 */ NO_SRV,
   /*  26 */ NO_SRV,
-  /*  27 */ 13870, 
-  /*  28 */ 13870, 
-  /*  29 */ 13870, 
-  /*  30 */ 13870, 
-  /*  31 */ 13870, 
-  /*  32 */ 13870, 
-  /*  33 */ 13870, 
-  /*  34 */ 14843, 
-  /*  35 */ 14844, 
-  /*  36 */ 14844, 
-  /*  37 */ 14844, 
-  /*  38 */ 14844, 
-  /*  39 */ 14844, 
-  /*  40 */ 13870, 
-  /*  41 */ 90001, 
-  /*  42 */ 90001, 
-  /*  43 */ 14846, 
-  /*  44 */ 14846, 
-  /*  45 */ 14846, 
-  /*  46 */ 14846, 
-  /*  47 */ 14846, 
-  /*  48 */ 14846, 
-  /*  49 */ 90001, 
-  /*  50 */ 15429, 
-  /*  51 */ 15429, 
-  /*  52 */ 15429, 
-  /*  53 */ 15429, 
-  /*  54 */ 15431, 
-  /*  55 */ 15431, 
-  /*  56 */ 15431, 
-  /*  57 */ 15052, 
-  /*  58 */ 15052, 
-  /*  59 */ 15050, 
-  /*  60 */ 15050, 
-  /*  61 */ 15050, 
-  /*  62 */ 15050, 
-  /*  63 */ 15050, 
-  /*  64 */ 15050, 
-  /*  65 */ 15050, 
-  /*  66 */ 15054, 
-  /*  67 */ 15054, 
-  /*  68 */ 15054, 
-  /*  69 */ 15054, 
-  /*  70 */ 15054, 
-  /*  71 */ 15431, 
-  /*  72 */ 15433, 
-  /*  73 */ 15433, 
-  /*  74 */ 15433, 
-  /*  75 */ 15433, 
-  /*  76 */ 15433, 
-  /*  77 */ 15433, 
-  /*  78 */ 15507, 
-  /*  79 */ 15507, 
-  /*  80 */  3471, 
-  /*  81 */  3471, 
-  /*  82 */  3471, 
+  /*  27 */ 13870,
+  /*  28 */ 13870,
+  /*  29 */ 13870,
+  /*  30 */ 13870,
+  /*  31 */ 13870,
+  /*  32 */ 13870,
+  /*  33 */ 13870,
+  /*  34 */ 14843,
+  /*  35 */ 14844,
+  /*  36 */ 14844,
+  /*  37 */ 14844,
+  /*  38 */ 14844,
+  /*  39 */ 14844,
+  /*  40 */ 13870,
+  /*  41 */ 90001,
+  /*  42 */ 90001,
+  /*  43 */ 14846,
+  /*  44 */ 14846,
+  /*  45 */ 14846,
+  /*  46 */ 14846,
+  /*  47 */ 14846,
+  /*  48 */ 14846,
+  /*  49 */ 90001,
+  /*  50 */ 15429,
+  /*  51 */ 15429,
+  /*  52 */ 15429,
+  /*  53 */ 15429,
+  /*  54 */ 15431,
+  /*  55 */ 15431,
+  /*  56 */ 15431,
+  /*  57 */ 15052,
+  /*  58 */ 15052,
+  /*  59 */ 15050,
+  /*  60 */ 15050,
+  /*  61 */ 15050,
+  /*  62 */ 15050,
+  /*  63 */ 15050,
+  /*  64 */ 15050,
+  /*  65 */ 15050,
+  /*  66 */ 15054,
+  /*  67 */ 15054,
+  /*  68 */ 15054,
+  /*  69 */ 15054,
+  /*  70 */ 15054,
+  /*  71 */ 15431,
+  /*  72 */ 15433,
+  /*  73 */ 15433,
+  /*  74 */ 15433,
+  /*  75 */ 15433,
+  /*  76 */ 15433,
+  /*  77 */ 15433,
+  /*  78 */ 15507,
+  /*  79 */ 15507,
+  /*  80 */  3471,
+  /*  81 */  3471,
+  /*  82 */  3471,
   /*  83 */ NO_SRV,
-  /*  84 */ 15772, 
-  /*  85 */ 15772, 
-  /*  86 */ 13874, 
-  /*  87 */ 15992, 
-  /*  88 */ 15992, 
-  /*  89 */ 17876, 
-  /*  90 */ 17876, 
-  /*  91 */ 17876, 
-  /*  92 */ 17876, 
-  /*  93 */ 17878, 
-  /*  94 */ 17878, 
-  /*  95 */ 17878, 
-  /*  96 */ 17878, 
-  /*  97 */ 15429, 
-  /*  98 */ 15429, 
-  /*  99 */ 19460, 
-  /* 100 */ 19460, 
-  /* 101 */ 19460, 
-  /* 102 */ 19460, 
-  /* 103 */ 21407, 
-  /* 104 */ 21407, 
-  /* 105 */ 21889, 
-  /* 106 */ 21889, 
-  /* 107 */   325, 
-  /* 108 */   325, 
-  /* 109 */   325, 
-  /* 110 */   325, 
-  /* 111 */   325, 
-  /* 112 */   344, 
-  /* 113 */   344, 
-  /* 114 */   344, 
-  /* 115 */  3471, 
-  /* 116 */  3471, 
-  /* 117 */  3471, 
-  /* 118 */  3471, 
-  /* 119 */  3472, 
-  /* 120 */  3472, 
-};                                 
+  /*  84 */ 15772,
+  /*  85 */ 15772,
+  /*  86 */ 13874,
+  /*  87 */ 15992,
+  /*  88 */ 15992,
+  /*  89 */ 17876,
+  /*  90 */ 17876,
+  /*  91 */ 17876,
+  /*  92 */ 17876,
+  /*  93 */ 17878,
+  /*  94 */ 17878,
+  /*  95 */ 17878,
+  /*  96 */ 17878,
+  /*  97 */ 15429,
+  /*  98 */ 15429,
+  /*  99 */ 19460,
+  /* 100 */ 19460,
+  /* 101 */ 19460,
+  /* 102 */ 19460,
+  /* 103 */ 21407,
+  /* 104 */ 21407,
+  /* 105 */ 21889,
+  /* 106 */ 21889,
+  /* 107 */   325,
+  /* 108 */   325,
+  /* 109 */   325,
+  /* 110 */   325,
+  /* 111 */   325,
+  /* 112 */   344,
+  /* 113 */   344,
+  /* 114 */   344,
+  /* 115 */  3471,
+  /* 116 */  3471,
+  /* 117 */  3471,
+  /* 118 */  3471,
+  /* 119 */  3472,
+  /* 120 */  3472,
+};
 
 static const value_string qsig_str_operation[] = {
 #include "packet-qsig-table10.c"
@@ -276,7 +276,7 @@ static const value_string qsig_str_error[] = {
 #include "packet-qsig-table20.c"
   {   0, NULL}
 };
-                     
+
 /* Initialize the protocol and registered fields */
 static int proto_qsig = -1;
 static int hf_qsig_operation = -1;
@@ -312,7 +312,7 @@ static gint ett_cnq_PSS1InformationElement = -1;
 /* Preferences */
 
 /* Subdissectors */
-static dissector_handle_t q931_ie_handle = NULL; 
+static dissector_handle_t q931_ie_handle = NULL;
 
 /* Global variables */
 static const char *extension_oid = NULL;
@@ -332,7 +332,7 @@ typedef struct _qsig_op_t {
 
 static const qsig_op_t qsig_op_tab[] = {
 #include "packet-qsig-table11.c"
-};                                 
+};
 
 typedef struct _qsig_err_t {
   gint32 errcode;
@@ -341,7 +341,7 @@ typedef struct _qsig_err_t {
 
 static const qsig_err_t qsig_err_tab[] = {
 #include "packet-qsig-table21.c"
-};                                 
+};
 
 static const qsig_op_t *get_op(gint32 opcode) {
   int i;
@@ -368,9 +368,9 @@ static const qsig_err_t *get_err(gint32 errcode) {
       return &qsig_err_tab[i];
   return NULL;
 }
-                  
+
 /*--- dissect_qsig_arg ------------------------------------------------------*/
-static int   
+static int
 dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   int offset;
   rose_ctx_t *rctx;
@@ -384,7 +384,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   rctx = get_rose_ctx(pinfo->private_data);
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 1)  /* invoke */
-    return offset; 
+    return offset;
   if (rctx->d.code == 0) {  /* local */
     opcode = rctx->d.code_local;
     op_ptr = get_op(opcode);
@@ -392,14 +392,14 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     op_ptr = g_hash_table_lookup(qsig_oid2op_hashtable, rctx->d.code_global);
     if (op_ptr) opcode = op_ptr->opcode;
   } else {
-    return offset; 
+    return offset;
   }
   if (!op_ptr)
-    return offset; 
+    return offset;
   service = get_service(opcode);
 
   ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
-  qsig_tree = proto_item_add_subtree(ti, ett_qsig); 
+  qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode);
   p = match_strval(opcode, VALS(qsig_str_operation));
@@ -416,7 +416,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   if (op_ptr->arg_pdu)
     offset = op_ptr->arg_pdu(tvb, pinfo, qsig_tree);
-  else 
+  else
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED ARGUMENT TYPE (QSIG)");
       offset += tvb_length_remaining(tvb, offset);
@@ -440,17 +440,17 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   rctx = get_rose_ctx(pinfo->private_data);
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 2)  /* returnResult */
-    return offset; 
+    return offset;
   if (rctx->d.code != 0)  /* local */
-    return offset; 
+    return offset;
   opcode = rctx->d.code_local;
   op_ptr = get_op(opcode);
   if (!op_ptr)
-    return offset; 
+    return offset;
   service = get_service(opcode);
 
   ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
-  qsig_tree = proto_item_add_subtree(ti, ett_qsig); 
+  qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode);
   p = match_strval(opcode, VALS(qsig_str_operation));
@@ -467,7 +467,7 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   if (op_ptr->res_pdu)
     offset = op_ptr->res_pdu(tvb, pinfo, qsig_tree);
-  else 
+  else
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED RESULT TYPE (QSIG)");
       offset += tvb_length_remaining(tvb, offset);
@@ -477,7 +477,7 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 }
 
 /*--- dissect_qsig_err ------------------------------------------------------*/
-static int   
+static int
 dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   int offset;
   rose_ctx_t *rctx;
@@ -491,16 +491,16 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   rctx = get_rose_ctx(pinfo->private_data);
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 3)  /* returnError */
-    return offset; 
+    return offset;
   if (rctx->d.code != 0)  /* local */
-    return offset; 
+    return offset;
   errcode = rctx->d.code_local;
   err_ptr = get_err(errcode);
   if (!err_ptr)
-    return offset; 
+    return offset;
 
   ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
-  qsig_tree = proto_item_add_subtree(ti, ett_qsig); 
+  qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_error, tvb, 0, 0, errcode);
   p = match_strval(errcode, VALS(qsig_str_error));
@@ -513,7 +513,7 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   if (err_ptr->err_pdu)
     offset = err_ptr->err_pdu(tvb, pinfo, qsig_tree);
-  else 
+  else
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED ERROR TYPE (QSIG)");
       offset += tvb_length_remaining(tvb, offset);
@@ -530,7 +530,7 @@ dissect_qsig_transit_counter_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U
   return offset;
 }
 /*--- dissect_qsig_party_category_ie ----------------------------------------*/
-static int 
+static int
 dissect_qsig_party_category_ie(tvbuff_t *tvb, int offset, packet_info *pinfo  _U_, proto_tree *tree, int length  _U_) {
   proto_tree_add_item(tree, hf_qsig_pc, tvb, offset, 1, FALSE);
   offset++;
@@ -555,7 +555,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset
 
   ti_ie = proto_tree_add_text(tree, tvb, offset, -1, "%s",
             val_to_str(ie_type, VALS(qsig_str_ie_type[codeset]), "unknown (0x%02X)"));
-  ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie); 
+  ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie);
   proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, FALSE);
   hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE);
   PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -572,7 +572,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset
       break;
     default:
       if (ie_len > 0) {
-        if (tree) proto_tree_add_item(ie_tree, hf_qsig_ie_data, tvb, offset, ie_len, FALSE);
+        if (tree) proto_tree_add_item(ie_tree, hf_qsig_ie_data, tvb, offset, ie_len, ENC_NA);
       }
   }
 }
@@ -679,7 +679,7 @@ void proto_reg_handoff_qsig(void) {
   int i;
   gint key;
   const gchar *oid;
-  dissector_handle_t q931_handle; 
+  dissector_handle_t q931_handle;
   dissector_handle_t qsig_arg_handle;
   dissector_handle_t qsig_res_handle;
   dissector_handle_t qsig_err_handle;
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 69d68df621..4c61eddd83 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -467,7 +467,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 	pt_varbind = proto_item_add_subtree(pi_varbind,ett_varbind);
 	*label = '\0';
 
-	pi_name = proto_tree_add_item(pt_varbind,hf_snmp_objectname,tvb,name_offset,name_len,ENC_BIG_ENDIAN);
+	pi_name = proto_tree_add_item(pt_varbind,hf_snmp_objectname,tvb,name_offset,name_len,ENC_NA);
 	pt_name = proto_item_add_subtree(pi_name,ett_name);
 
 	/* fetch ObjectName and its relative oid_info */
@@ -538,7 +538,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 			} else if (oid_left  == 0) {
 				if (ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) {
 					/* unSpecified  does not require an instance sub-id add the new value and get off the way! */
-					pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN);
+					pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_NA);
 					goto set_label;
 				} else {
 					proto_item* pi = proto_tree_add_text(pt_name,tvb,0,0,"A scalar should have one instance sub-id this one has none");
@@ -562,7 +562,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 				if ( key_len == 0 && ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) {
 					/* unSpecified  does not require an instance sub-id add the new value and get off the way! */
-					pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN);
+					pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_NA);
 					goto set_label;
 				}
 
@@ -729,7 +729,7 @@ indexing_done:
 
 	if (oid_info_is_ok && oid_info->value_type) {
 		if (ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) {
-			pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN);
+			pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_NA);
 		} else {
 			/* Provide a tree_item to attach errors to, if needed. */
 			pi_value = pi_name;
@@ -1030,7 +1030,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
 	  proto_item_append_text(item, (enterpriseid==2021) ? ": UCD-SNMP Random" : ": Net-SNMP Random");
 	  /* demystify: 4B random, 4B epoch seconds */
 	  if (len_remain==8) {
-	    proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, 4, ENC_BIG_ENDIAN);
+	    proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, 4, ENC_NA);
 	    seconds = tvb_get_letohl(tvb, offset+4);
 	    ts.secs = seconds;
 	    ts.nsecs = 0;
@@ -1046,7 +1046,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
       default:
 	/* max. 27 bytes, administratively assigned or unknown format */
 	if (len_remain<=27) {
-	  proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, len_remain, ENC_BIG_ENDIAN);
+	  proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, len_remain, ENC_NA);
 	  offset+=len_remain;
 	  len_remain=0;
 	}
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index 88781274bd..0a77a23dcb 100644
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -189,7 +189,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
 	item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, offset,
-				   -1, FALSE);
+				   -1, ENC_NA);
 
 	subtree = proto_item_add_subtree(item, ett_spnego_krb5);
 
@@ -799,14 +799,14 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	/* Encrypted sequence number */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_snd_seq, tvb, offset, 8,
-			    TRUE);
+			    ENC_NA);
 
 	offset += 8;
 
 	/* Checksum of plaintext padded data */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset, 8,
-			    TRUE);
+			    ENC_NA);
 
 	offset += 8;
 
@@ -823,7 +823,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	       we may need to make this an option. gal 17/2/06 */
 	    (sgn_alg == KRB_SGN_ALG_DES_MAC_MD5)) {
 	  proto_tree_add_item(tree, hf_spnego_krb5_confounder, tvb, offset, 8,
-			      TRUE);
+			      ENC_NA);
 	  offset += 8;
 	}
 
@@ -912,14 +912,14 @@ dissect_spnego_krb5_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinfo _U
 	/* Encrypted sequence number */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_snd_seq, tvb, offset, 8,
-			    TRUE);
+			    ENC_NA);
 
 	offset += 8;
 
 	/* Checksum of plaintext padded data */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset, 8,
-			    TRUE);
+			    ENC_NA);
 
 	offset += 8;
 
@@ -937,7 +937,7 @@ dissect_spnego_krb5_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinfo _U
 	if (tvb_length_remaining(tvb, offset)) {
 	  if (sgn_alg == KRB_SGN_ALG_HMAC) {
 	    proto_tree_add_item(tree, hf_spnego_krb5_confounder, tvb, offset, 8,
-			      TRUE);
+			      ENC_NA);
 
 	    offset += 8;
 	  }
@@ -1014,7 +1014,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	/* Skip the filler */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_filler, tvb, offset, 1,
-			    FALSE);
+			    ENC_NA);
 	offset += 1;
 
 	/* EC */
@@ -1044,7 +1044,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	}
 
 	proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset,
-			    checksum_size, FALSE);
+			    checksum_size, ENC_NA);
 	offset += checksum_size;
 
 	if(pinfo->decrypt_gssapi_tvb){
@@ -1132,7 +1132,7 @@ dissect_spnego_krb5_cfx_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinf
 	/* Skip the filler */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_filler, tvb, offset, 5,
-			    FALSE);
+			    ENC_NA);
 	offset += 5;
 
 	/* sequence number */
@@ -1146,7 +1146,7 @@ dissect_spnego_krb5_cfx_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinf
 	checksum_size = tvb_length_remaining(tvb, offset);
 
 	proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset,
-			    checksum_size, FALSE);
+			    checksum_size, ENC_NA);
 	offset += checksum_size;
 
 	/*
@@ -1174,7 +1174,7 @@ dissect_spnego_krb5_wrap(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
 	int offset = 0;
 	guint16 token_id;
 
-	item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, 0, -1, FALSE);
+	item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, 0, -1, ENC_NA);
 
 	subtree = proto_item_add_subtree(item, ett_spnego_krb5);
 
diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c
index ff04cbed83..ac4a184768 100644
--- a/asn1/tetra/packet-tetra-template.c
+++ b/asn1/tetra/packet-tetra-template.c
@@ -497,7 +497,7 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		}
 
 		/* Registers */
-		tetra_sub_item = proto_tree_add_item( tetra_tree, hf_tetra_header, tvb, offset, -1, FALSE );
+		tetra_sub_item = proto_tree_add_item( tetra_tree, hf_tetra_header, tvb, offset, -1, ENC_NA );
 		tetra_header_tree = proto_item_add_subtree(tetra_sub_item, ett_tetra);
 
 		/* Timer */
diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c
index 64c2478a99..245f74afbb 100644
--- a/epan/dissectors/packet-mpeg-audio.c
+++ b/epan/dissectors/packet-mpeg-audio.c
@@ -508,12 +508,12 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		unsigned int padding;
 
 		proto_tree_add_item(tree, hf_mpeg_audio_data, tvb,
-				offset / 8, data_size, FALSE);
+				offset / 8, data_size, ENC_NA);
 		offset += data_size * 8;
 		padding = mpa_padding(&mpa);
 		if (padding > 0) {
 			proto_tree_add_item(tree, hf_mpeg_audio_padbytes, tvb,
-					offset / 8, padding, FALSE);
+					offset / 8, padding, ENC_NA);
 			offset += padding * 8;
 		}
 	}
@@ -540,7 +540,7 @@ dissect_id3v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2");
 	col_clear(pinfo->cinfo, COL_INFO);
 	proto_tree_add_item(tree, hf_id3v2, tvb,
-			0, -1, FALSE);
+			0, -1, ENC_NA);
 }
 
 static gboolean
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c
index 7a76921cbb..a91d2cfc13 100644
--- a/epan/dissectors/packet-mpeg-pes.c
+++ b/epan/dissectors/packet-mpeg-pes.c
@@ -639,7 +639,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
 		proto_tree *root, unsigned flags)
 {
 	proto_item *item = proto_tree_add_item(root, hf_mpeg_pes_header_data, tvb,
-			0, -1, FALSE);
+			0, -1, ENC_NA);
 	proto_tree *tree = proto_item_add_subtree(item, ett_mpeg_pes_header_data);
 
 	gint offset = 0;
@@ -693,7 +693,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
 
 		trick_item = proto_tree_add_item(item,
 			hf_mpeg_pes_dsm_trick_mode, tvb,
-				offset, 1, FALSE);
+				offset, 1, ENC_NA);
 
 		trick_tree = proto_item_add_subtree(trick_item,
 			ett_mpeg_pes_trick_mode);
@@ -793,7 +793,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, gint offset,
 	unsigned program_mux_rate, stuffing_length;
 
 	proto_item *item = proto_tree_add_item(root, hf_mpeg_pes_pack_header, tvb,
-			offset / 8, 10, FALSE);
+			offset / 8, 10, ENC_NA);
 	proto_tree *tree = proto_item_add_subtree(item, ett_mpeg_pes_pack_header);
 
 	nstime_t nst;
@@ -818,7 +818,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, gint offset,
 
 	if (stuffing_length > 0) {
 		proto_tree_add_item(tree, hf_mpeg_pes_stuffing, tvb,
-				offset / 8, stuffing_length, FALSE);
+				offset / 8, stuffing_length, ENC_NA);
 		offset += stuffing_length * 8;
 	}
 
@@ -874,7 +874,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		offset = dissect_mpeg_pes_Picture(tvb, offset, &asn1_ctx,
 				tree, hf_mpeg_video_picture);
 		proto_tree_add_item(tree, hf_mpeg_video_data, tvb,
-				offset / 8, -1, FALSE);
+				offset / 8, -1, ENC_NA);
 	} else if (stream == STREAM_SEQUENCE) {
 		tvbuff_t *es;
 
@@ -882,7 +882,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				tree, hf_mpeg_video_sequence_header);
 
 		proto_tree_add_item(tree, hf_mpeg_video_quantization_matrix, tvb,
-				offset / 8, 64, FALSE);
+				offset / 8, 64, ENC_NA);
 		offset += 64 * 8;
 
 		es = tvb_new_subset_remaining(tvb, offset / 8);
@@ -908,7 +908,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			offset = dissect_mpeg_pes_pack_header(tvb, offset, pinfo, tree);
 		} else {
 			proto_tree_add_item(tree, hf_mpeg_pes_data, tvb,
-					offset / 8, 8, FALSE);
+					offset / 8, 8, ENC_NA);
 			offset += 8 * 8;
 		}
 	} else if (stream == STREAM_SYSTEM || stream == STREAM_PRIVATE2) {
@@ -918,7 +918,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		offset += 2 * 8;
 
 		proto_tree_add_item(tree, hf_mpeg_pes_data, tvb,
-				offset / 8, data_length, FALSE);
+				offset / 8, data_length, ENC_NA);
 	} else if (stream == STREAM_PADDING) {
 		unsigned padding_length = tvb_get_ntohs(tvb, offset / 8);
 		proto_tree_add_item(tree, hf_mpeg_pes_length, tvb,
@@ -926,7 +926,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		offset += 2 * 8;
 
 		proto_tree_add_item(tree, hf_mpeg_pes_padding, tvb,
-				offset / 8, padding_length, FALSE);
+				offset / 8, padding_length, ENC_NA);
 	} else if (stream == STREAM_PRIVATE1
 			|| stream >= STREAM_AUDIO) {
 		int length = tvb_get_ntohs(tvb, 4);
@@ -962,7 +962,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 			/* length may be zero for Video stream */
 			if(length==0){
-				proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, (offset>>3),-1, FALSE);
+				proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, (offset>>3),-1, ENC_NA);
 				return TRUE;
 			}
 
@@ -973,7 +973,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				dissect_mpeg(es, pinfo, tree);
 			else
 				proto_tree_add_item(tree, hf_mpeg_pes_data, es,
-						0, -1, FALSE);
+						0, -1, ENC_NA);
 		} else {
 			unsigned data_length = tvb_get_ntohs(tvb, offset / 8);
 			proto_tree_add_item(tree, hf_mpeg_pes_length, tvb,
@@ -981,11 +981,11 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			offset += 2 * 8;
 
 			proto_tree_add_item(tree, hf_mpeg_pes_data, tvb,
-					offset / 8, data_length, FALSE);
+					offset / 8, data_length, ENC_NA);
 		}
 	} else {
 		proto_tree_add_item(tree, hf_mpeg_pes_data, tvb,
-				offset / 8, -1, FALSE);
+				offset / 8, -1, ENC_NA);
 	}
 	return TRUE;
 }
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 2bf5fb95f6..d3496b0966 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -152,128 +152,128 @@ static const value_string qsig_str_service_name[] = {
 
 #define NO_SRV (-1)
 static const gint32 op2srv_tab[] = {
-  /*   0 */ 13868, 
-  /*   1 */ 13868, 
-  /*   2 */ 13868, 
-  /*   3 */ 13868, 
-  /*   4 */ 13874, 
-  /*   5 */ 13874, 
-  /*   6 */ 13874, 
-  /*   7 */ 13869, 
-  /*   8 */ 13869, 
-  /*   9 */ 13869, 
-  /*  10 */ 13869, 
-  /*  11 */ 13869, 
-  /*  12 */ 13869, 
-  /*  13 */ 13869, 
-  /*  14 */ 13869, 
-  /*  15 */ 13873, 
-  /*  16 */ 13873, 
-  /*  17 */ 13873, 
-  /*  18 */ 13873, 
-  /*  19 */ 13873, 
-  /*  20 */ 13873, 
-  /*  21 */ 13873, 
-  /*  22 */ 13873, 
-  /*  23 */ 13873, 
+  /*   0 */ 13868,
+  /*   1 */ 13868,
+  /*   2 */ 13868,
+  /*   3 */ 13868,
+  /*   4 */ 13874,
+  /*   5 */ 13874,
+  /*   6 */ 13874,
+  /*   7 */ 13869,
+  /*   8 */ 13869,
+  /*   9 */ 13869,
+  /*  10 */ 13869,
+  /*  11 */ 13869,
+  /*  12 */ 13869,
+  /*  13 */ 13869,
+  /*  14 */ 13869,
+  /*  15 */ 13873,
+  /*  16 */ 13873,
+  /*  17 */ 13873,
+  /*  18 */ 13873,
+  /*  19 */ 13873,
+  /*  20 */ 13873,
+  /*  21 */ 13873,
+  /*  22 */ 13873,
+  /*  23 */ 13873,
   /*  24 */ NO_SRV,
   /*  25 */ NO_SRV,
   /*  26 */ NO_SRV,
-  /*  27 */ 13870, 
-  /*  28 */ 13870, 
-  /*  29 */ 13870, 
-  /*  30 */ 13870, 
-  /*  31 */ 13870, 
-  /*  32 */ 13870, 
-  /*  33 */ 13870, 
-  /*  34 */ 14843, 
-  /*  35 */ 14844, 
-  /*  36 */ 14844, 
-  /*  37 */ 14844, 
-  /*  38 */ 14844, 
-  /*  39 */ 14844, 
-  /*  40 */ 13870, 
-  /*  41 */ 90001, 
-  /*  42 */ 90001, 
-  /*  43 */ 14846, 
-  /*  44 */ 14846, 
-  /*  45 */ 14846, 
-  /*  46 */ 14846, 
-  /*  47 */ 14846, 
-  /*  48 */ 14846, 
-  /*  49 */ 90001, 
-  /*  50 */ 15429, 
-  /*  51 */ 15429, 
-  /*  52 */ 15429, 
-  /*  53 */ 15429, 
-  /*  54 */ 15431, 
-  /*  55 */ 15431, 
-  /*  56 */ 15431, 
-  /*  57 */ 15052, 
-  /*  58 */ 15052, 
-  /*  59 */ 15050, 
-  /*  60 */ 15050, 
-  /*  61 */ 15050, 
-  /*  62 */ 15050, 
-  /*  63 */ 15050, 
-  /*  64 */ 15050, 
-  /*  65 */ 15050, 
-  /*  66 */ 15054, 
-  /*  67 */ 15054, 
-  /*  68 */ 15054, 
-  /*  69 */ 15054, 
-  /*  70 */ 15054, 
-  /*  71 */ 15431, 
-  /*  72 */ 15433, 
-  /*  73 */ 15433, 
-  /*  74 */ 15433, 
-  /*  75 */ 15433, 
-  /*  76 */ 15433, 
-  /*  77 */ 15433, 
-  /*  78 */ 15507, 
-  /*  79 */ 15507, 
-  /*  80 */  3471, 
-  /*  81 */  3471, 
-  /*  82 */  3471, 
+  /*  27 */ 13870,
+  /*  28 */ 13870,
+  /*  29 */ 13870,
+  /*  30 */ 13870,
+  /*  31 */ 13870,
+  /*  32 */ 13870,
+  /*  33 */ 13870,
+  /*  34 */ 14843,
+  /*  35 */ 14844,
+  /*  36 */ 14844,
+  /*  37 */ 14844,
+  /*  38 */ 14844,
+  /*  39 */ 14844,
+  /*  40 */ 13870,
+  /*  41 */ 90001,
+  /*  42 */ 90001,
+  /*  43 */ 14846,
+  /*  44 */ 14846,
+  /*  45 */ 14846,
+  /*  46 */ 14846,
+  /*  47 */ 14846,
+  /*  48 */ 14846,
+  /*  49 */ 90001,
+  /*  50 */ 15429,
+  /*  51 */ 15429,
+  /*  52 */ 15429,
+  /*  53 */ 15429,
+  /*  54 */ 15431,
+  /*  55 */ 15431,
+  /*  56 */ 15431,
+  /*  57 */ 15052,
+  /*  58 */ 15052,
+  /*  59 */ 15050,
+  /*  60 */ 15050,
+  /*  61 */ 15050,
+  /*  62 */ 15050,
+  /*  63 */ 15050,
+  /*  64 */ 15050,
+  /*  65 */ 15050,
+  /*  66 */ 15054,
+  /*  67 */ 15054,
+  /*  68 */ 15054,
+  /*  69 */ 15054,
+  /*  70 */ 15054,
+  /*  71 */ 15431,
+  /*  72 */ 15433,
+  /*  73 */ 15433,
+  /*  74 */ 15433,
+  /*  75 */ 15433,
+  /*  76 */ 15433,
+  /*  77 */ 15433,
+  /*  78 */ 15507,
+  /*  79 */ 15507,
+  /*  80 */  3471,
+  /*  81 */  3471,
+  /*  82 */  3471,
   /*  83 */ NO_SRV,
-  /*  84 */ 15772, 
-  /*  85 */ 15772, 
-  /*  86 */ 13874, 
-  /*  87 */ 15992, 
-  /*  88 */ 15992, 
-  /*  89 */ 17876, 
-  /*  90 */ 17876, 
-  /*  91 */ 17876, 
-  /*  92 */ 17876, 
-  /*  93 */ 17878, 
-  /*  94 */ 17878, 
-  /*  95 */ 17878, 
-  /*  96 */ 17878, 
-  /*  97 */ 15429, 
-  /*  98 */ 15429, 
-  /*  99 */ 19460, 
-  /* 100 */ 19460, 
-  /* 101 */ 19460, 
-  /* 102 */ 19460, 
-  /* 103 */ 21407, 
-  /* 104 */ 21407, 
-  /* 105 */ 21889, 
-  /* 106 */ 21889, 
-  /* 107 */   325, 
-  /* 108 */   325, 
-  /* 109 */   325, 
-  /* 110 */   325, 
-  /* 111 */   325, 
-  /* 112 */   344, 
-  /* 113 */   344, 
-  /* 114 */   344, 
-  /* 115 */  3471, 
-  /* 116 */  3471, 
-  /* 117 */  3471, 
-  /* 118 */  3471, 
-  /* 119 */  3472, 
-  /* 120 */  3472, 
-};                                 
+  /*  84 */ 15772,
+  /*  85 */ 15772,
+  /*  86 */ 13874,
+  /*  87 */ 15992,
+  /*  88 */ 15992,
+  /*  89 */ 17876,
+  /*  90 */ 17876,
+  /*  91 */ 17876,
+  /*  92 */ 17876,
+  /*  93 */ 17878,
+  /*  94 */ 17878,
+  /*  95 */ 17878,
+  /*  96 */ 17878,
+  /*  97 */ 15429,
+  /*  98 */ 15429,
+  /*  99 */ 19460,
+  /* 100 */ 19460,
+  /* 101 */ 19460,
+  /* 102 */ 19460,
+  /* 103 */ 21407,
+  /* 104 */ 21407,
+  /* 105 */ 21889,
+  /* 106 */ 21889,
+  /* 107 */   325,
+  /* 108 */   325,
+  /* 109 */   325,
+  /* 110 */   325,
+  /* 111 */   325,
+  /* 112 */   344,
+  /* 113 */   344,
+  /* 114 */   344,
+  /* 115 */  3471,
+  /* 116 */  3471,
+  /* 117 */  3471,
+  /* 118 */  3471,
+  /* 119 */  3472,
+  /* 120 */  3472,
+};
 
 static const value_string qsig_str_operation[] = {
 
@@ -685,7 +685,7 @@ static const value_string qsig_str_error[] = {
 #line 277 "../../asn1/qsig/packet-qsig-template.c"
   {   0, NULL}
 };
-                     
+
 /* Initialize the protocol and registered fields */
 static int proto_qsig = -1;
 static int hf_qsig_operation = -1;
@@ -2043,7 +2043,7 @@ static gint ett_cnq_PSS1InformationElement = -1;
 /* Preferences */
 
 /* Subdissectors */
-static dissector_handle_t q931_ie_handle = NULL; 
+static dissector_handle_t q931_ie_handle = NULL;
 
 /* Global variables */
 static const char *extension_oid = NULL;
@@ -12152,7 +12152,7 @@ static const qsig_op_t qsig_op_tab[] = {
 
 /*--- End of included file: packet-qsig-table11.c ---*/
 #line 335 "../../asn1/qsig/packet-qsig-template.c"
-};                                 
+};
 
 typedef struct _qsig_err_t {
   gint32 errcode;
@@ -12349,7 +12349,7 @@ static const qsig_err_t qsig_err_tab[] = {
 
 /*--- End of included file: packet-qsig-table21.c ---*/
 #line 344 "../../asn1/qsig/packet-qsig-template.c"
-};                                 
+};
 
 static const qsig_op_t *get_op(gint32 opcode) {
   int i;
@@ -12376,9 +12376,9 @@ static const qsig_err_t *get_err(gint32 errcode) {
       return &qsig_err_tab[i];
   return NULL;
 }
-                  
+
 /*--- dissect_qsig_arg ------------------------------------------------------*/
-static int   
+static int
 dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   int offset;
   rose_ctx_t *rctx;
@@ -12392,7 +12392,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   rctx = get_rose_ctx(pinfo->private_data);
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 1)  /* invoke */
-    return offset; 
+    return offset;
   if (rctx->d.code == 0) {  /* local */
     opcode = rctx->d.code_local;
     op_ptr = get_op(opcode);
@@ -12400,14 +12400,14 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     op_ptr = g_hash_table_lookup(qsig_oid2op_hashtable, rctx->d.code_global);
     if (op_ptr) opcode = op_ptr->opcode;
   } else {
-    return offset; 
+    return offset;
   }
   if (!op_ptr)
-    return offset; 
+    return offset;
   service = get_service(opcode);
 
   ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
-  qsig_tree = proto_item_add_subtree(ti, ett_qsig); 
+  qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode);
   p = match_strval(opcode, VALS(qsig_str_operation));
@@ -12424,7 +12424,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   if (op_ptr->arg_pdu)
     offset = op_ptr->arg_pdu(tvb, pinfo, qsig_tree);
-  else 
+  else
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED ARGUMENT TYPE (QSIG)");
       offset += tvb_length_remaining(tvb, offset);
@@ -12448,17 +12448,17 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   rctx = get_rose_ctx(pinfo->private_data);
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 2)  /* returnResult */
-    return offset; 
+    return offset;
   if (rctx->d.code != 0)  /* local */
-    return offset; 
+    return offset;
   opcode = rctx->d.code_local;
   op_ptr = get_op(opcode);
   if (!op_ptr)
-    return offset; 
+    return offset;
   service = get_service(opcode);
 
   ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
-  qsig_tree = proto_item_add_subtree(ti, ett_qsig); 
+  qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode);
   p = match_strval(opcode, VALS(qsig_str_operation));
@@ -12475,7 +12475,7 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   if (op_ptr->res_pdu)
     offset = op_ptr->res_pdu(tvb, pinfo, qsig_tree);
-  else 
+  else
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED RESULT TYPE (QSIG)");
       offset += tvb_length_remaining(tvb, offset);
@@ -12485,7 +12485,7 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 }
 
 /*--- dissect_qsig_err ------------------------------------------------------*/
-static int   
+static int
 dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   int offset;
   rose_ctx_t *rctx;
@@ -12499,16 +12499,16 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   rctx = get_rose_ctx(pinfo->private_data);
   DISSECTOR_ASSERT(rctx);
   if (rctx->d.pdu != 3)  /* returnError */
-    return offset; 
+    return offset;
   if (rctx->d.code != 0)  /* local */
-    return offset; 
+    return offset;
   errcode = rctx->d.code_local;
   err_ptr = get_err(errcode);
   if (!err_ptr)
-    return offset; 
+    return offset;
 
   ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
-  qsig_tree = proto_item_add_subtree(ti, ett_qsig); 
+  qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_error, tvb, 0, 0, errcode);
   p = match_strval(errcode, VALS(qsig_str_error));
@@ -12521,7 +12521,7 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   if (err_ptr->err_pdu)
     offset = err_ptr->err_pdu(tvb, pinfo, qsig_tree);
-  else 
+  else
     if (tvb_length_remaining(tvb, offset) > 0) {
       proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED ERROR TYPE (QSIG)");
       offset += tvb_length_remaining(tvb, offset);
@@ -12538,7 +12538,7 @@ dissect_qsig_transit_counter_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U
   return offset;
 }
 /*--- dissect_qsig_party_category_ie ----------------------------------------*/
-static int 
+static int
 dissect_qsig_party_category_ie(tvbuff_t *tvb, int offset, packet_info *pinfo  _U_, proto_tree *tree, int length  _U_) {
   proto_tree_add_item(tree, hf_qsig_pc, tvb, offset, 1, FALSE);
   offset++;
@@ -12563,7 +12563,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset
 
   ti_ie = proto_tree_add_text(tree, tvb, offset, -1, "%s",
             val_to_str(ie_type, VALS(qsig_str_ie_type[codeset]), "unknown (0x%02X)"));
-  ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie); 
+  ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie);
   proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, FALSE);
   hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE);
   PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -12580,7 +12580,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset
       break;
     default:
       if (ie_len > 0) {
-        if (tree) proto_tree_add_item(ie_tree, hf_qsig_ie_data, tvb, offset, ie_len, FALSE);
+        if (tree) proto_tree_add_item(ie_tree, hf_qsig_ie_data, tvb, offset, ie_len, ENC_NA);
       }
   }
 }
@@ -16368,7 +16368,7 @@ void proto_reg_handoff_qsig(void) {
   int i;
   gint key;
   const gchar *oid;
-  dissector_handle_t q931_handle; 
+  dissector_handle_t q931_handle;
   dissector_handle_t qsig_arg_handle;
   dissector_handle_t qsig_res_handle;
   dissector_handle_t qsig_err_handle;
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index edecb4bbfb..6f5d1ed874 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -569,7 +569,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 	pt_varbind = proto_item_add_subtree(pi_varbind,ett_varbind);
 	*label = '\0';
 
-	pi_name = proto_tree_add_item(pt_varbind,hf_snmp_objectname,tvb,name_offset,name_len,ENC_BIG_ENDIAN);
+	pi_name = proto_tree_add_item(pt_varbind,hf_snmp_objectname,tvb,name_offset,name_len,ENC_NA);
 	pt_name = proto_item_add_subtree(pi_name,ett_name);
 
 	/* fetch ObjectName and its relative oid_info */
@@ -640,7 +640,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 			} else if (oid_left  == 0) {
 				if (ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) {
 					/* unSpecified  does not require an instance sub-id add the new value and get off the way! */
-					pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN);
+					pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_NA);
 					goto set_label;
 				} else {
 					proto_item* pi = proto_tree_add_text(pt_name,tvb,0,0,"A scalar should have one instance sub-id this one has none");
@@ -664,7 +664,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 				if ( key_len == 0 && ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) {
 					/* unSpecified  does not require an instance sub-id add the new value and get off the way! */
-					pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN);
+					pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_NA);
 					goto set_label;
 				}
 
@@ -831,7 +831,7 @@ indexing_done:
 
 	if (oid_info_is_ok && oid_info->value_type) {
 		if (ber_class == BER_CLASS_UNI && tag == BER_UNI_TAG_NULL) {
-			pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_BIG_ENDIAN);
+			pi_value = proto_tree_add_item(pt_varbind,hf_snmp_unSpecified,tvb,value_offset,value_len,ENC_NA);
 		} else {
 			/* Provide a tree_item to attach errors to, if needed. */
 			pi_value = pi_name;
@@ -1132,7 +1132,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
 	  proto_item_append_text(item, (enterpriseid==2021) ? ": UCD-SNMP Random" : ": Net-SNMP Random");
 	  /* demystify: 4B random, 4B epoch seconds */
 	  if (len_remain==8) {
-	    proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, 4, ENC_BIG_ENDIAN);
+	    proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, 4, ENC_NA);
 	    seconds = tvb_get_letohl(tvb, offset+4);
 	    ts.secs = seconds;
 	    ts.nsecs = 0;
@@ -1148,7 +1148,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
       default:
 	/* max. 27 bytes, administratively assigned or unknown format */
 	if (len_remain<=27) {
-	  proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, len_remain, ENC_BIG_ENDIAN);
+	  proto_tree_add_item(tree, hf_snmp_engineid_data, tvb, offset, len_remain, ENC_NA);
 	  offset+=len_remain;
 	  len_remain=0;
 	}
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 3033b17c41..b00bee2121 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -670,7 +670,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
 	item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, offset,
-				   -1, FALSE);
+				   -1, ENC_NA);
 
 	subtree = proto_item_add_subtree(item, ett_spnego_krb5);
 
@@ -1280,14 +1280,14 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	/* Encrypted sequence number */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_snd_seq, tvb, offset, 8,
-			    TRUE);
+			    ENC_NA);
 
 	offset += 8;
 
 	/* Checksum of plaintext padded data */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset, 8,
-			    TRUE);
+			    ENC_NA);
 
 	offset += 8;
 
@@ -1304,7 +1304,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	       we may need to make this an option. gal 17/2/06 */
 	    (sgn_alg == KRB_SGN_ALG_DES_MAC_MD5)) {
 	  proto_tree_add_item(tree, hf_spnego_krb5_confounder, tvb, offset, 8,
-			      TRUE);
+			      ENC_NA);
 	  offset += 8;
 	}
 
@@ -1393,14 +1393,14 @@ dissect_spnego_krb5_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinfo _U
 	/* Encrypted sequence number */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_snd_seq, tvb, offset, 8,
-			    TRUE);
+			    ENC_NA);
 
 	offset += 8;
 
 	/* Checksum of plaintext padded data */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset, 8,
-			    TRUE);
+			    ENC_NA);
 
 	offset += 8;
 
@@ -1418,7 +1418,7 @@ dissect_spnego_krb5_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinfo _U
 	if (tvb_length_remaining(tvb, offset)) {
 	  if (sgn_alg == KRB_SGN_ALG_HMAC) {
 	    proto_tree_add_item(tree, hf_spnego_krb5_confounder, tvb, offset, 8,
-			      TRUE);
+			      ENC_NA);
 
 	    offset += 8;
 	  }
@@ -1495,7 +1495,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	/* Skip the filler */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_filler, tvb, offset, 1,
-			    FALSE);
+			    ENC_NA);
 	offset += 1;
 
 	/* EC */
@@ -1525,7 +1525,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	}
 
 	proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset,
-			    checksum_size, FALSE);
+			    checksum_size, ENC_NA);
 	offset += checksum_size;
 
 	if(pinfo->decrypt_gssapi_tvb){
@@ -1613,7 +1613,7 @@ dissect_spnego_krb5_cfx_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinf
 	/* Skip the filler */
 
 	proto_tree_add_item(tree, hf_spnego_krb5_filler, tvb, offset, 5,
-			    FALSE);
+			    ENC_NA);
 	offset += 5;
 
 	/* sequence number */
@@ -1627,7 +1627,7 @@ dissect_spnego_krb5_cfx_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinf
 	checksum_size = tvb_length_remaining(tvb, offset);
 
 	proto_tree_add_item(tree, hf_spnego_krb5_sgn_cksum, tvb, offset,
-			    checksum_size, FALSE);
+			    checksum_size, ENC_NA);
 	offset += checksum_size;
 
 	/*
@@ -1655,7 +1655,7 @@ dissect_spnego_krb5_wrap(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
 	int offset = 0;
 	guint16 token_id;
 
-	item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, 0, -1, FALSE);
+	item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, 0, -1, ENC_NA);
 
 	subtree = proto_item_add_subtree(item, ett_spnego_krb5);
 
diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c
index 24a96159a8..fa03ef5762 100644
--- a/epan/dissectors/packet-tetra.c
+++ b/epan/dissectors/packet-tetra.c
@@ -9236,7 +9236,7 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		}
 
 		/* Registers */
-		tetra_sub_item = proto_tree_add_item( tetra_tree, hf_tetra_header, tvb, offset, -1, FALSE );
+		tetra_sub_item = proto_tree_add_item( tetra_tree, hf_tetra_header, tvb, offset, -1, ENC_NA );
 		tetra_header_tree = proto_item_add_subtree(tetra_sub_item, ett_tetra);
 
 		/* Timer */