For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.

Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503

35 files changed, 134 insertions, 134 deletions

diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index 05e8fa8c14..0cb366fa10 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -4429,7 +4429,7 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     /*
      * create the ansi_map protocol tree
      */
-    ansi_map_item = proto_tree_add_item(tree, proto_ansi_map, tvb, 0, -1, FALSE);
+    ansi_map_item = proto_tree_add_item(tree, proto_ansi_map, tvb, 0, -1, ENC_NA);
     ansi_map_tree = proto_item_add_subtree(ansi_map_item, ett_ansi_map);
     ansi_map_is_invoke = FALSE;
     is683_ota = FALSE;
diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c
index c7c35b8c7f..f375007e6e 100644
--- a/asn1/ansi_tcap/packet-ansi_tcap-template.c
+++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c
@@ -357,7 +357,7 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
     /* create display subtree for the protocol */
     if(parent_tree){
-      item = proto_tree_add_item(parent_tree, proto_ansi_tcap, tvb, 0, -1, FALSE);
+      item = proto_tree_add_item(parent_tree, proto_ansi_tcap, tvb, 0, -1, ENC_NA);
       tree = proto_item_add_subtree(item, ett_tcap);
       tcap_stat_item=item;
       tcap_stat_tree=tree;
@@ -465,7 +465,7 @@ proto_register_ansi_tcap(void)
 
 	static enum_val_t ansi_tcap_response_matching_type_values[] = {
 		{"Only Transaction ID will be used in Invoke/response matching",					"Transaction ID only", 0},
-		{"Transaction ID and Source will be used in Invoke/response matching",				"Transaction ID and Source", 1}, 
+		{"Transaction ID and Source will be used in Invoke/response matching",				"Transaction ID and Source", 1},
 		{"Transaction ID Source and Destination will be used in Invoke/response matching",	"Transaction ID Source and Destination", 2},
 		{NULL, NULL, -1}
 	};
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index f5239416c6..556d4c27e1 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -29,8 +29,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  * References: ETSI 300 374
  */
-/* 
- * Indentation logic: this file is indented with 2 spaces indentation. 
+/*
+ * Indentation logic: this file is indented with 2 spaces indentation.
  *                    there are no tabs.
  */
 #ifdef HAVE_CONFIG_H
@@ -74,7 +74,7 @@ static guint32 errorCode=0;
 /* ROSE context */
 static rose_ctx_t camel_rose_ctx;
 
-static int hf_digit = -1; 
+static int hf_digit = -1;
 static int hf_camel_extension_code_local = -1;
 static int hf_camel_error_code_local = -1;
 static int hf_camel_cause_indicator = -1;
@@ -192,8 +192,8 @@ static const value_string digit_value[] = {
     { 12, "spare"},
     { 13, "spare"},
     { 0,  NULL}};
-  
-  
+
+
 static const value_string camel_nature_of_addr_indicator_values[] = {
   {   0x00,  "unknown" },
   {   0x01,  "International Number" },
@@ -280,7 +280,7 @@ static char camel_number_to_char(int number)
 
 /*
  * 24.011 8.2.5.4
- */   
+ */
 static guint8
 dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len,
 		    proto_tree *tree, int hf_cause_value, guint8 *cause_value)
@@ -288,21 +288,21 @@ dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len,
   guint8	oct;
   guint32	curr_offset;
   static char a_bigbuf[1024];
-  
+
   curr_offset = offset;
   oct = tvb_get_guint8(tvb, curr_offset);
 
-  *cause_value = oct & 0x7f; 
-  
+  *cause_value = oct & 0x7f;
+
   other_decode_bitfield_value(a_bigbuf, oct, 0x7f, 8);
   proto_tree_add_uint_format(tree, hf_cause_value,
 			     tvb, curr_offset, 1, *cause_value,
 			     "%s : %s",
 			     a_bigbuf,
-			     val_to_str(*cause_value, camel_RP_Cause_values, 
+			     val_to_str(*cause_value, camel_RP_Cause_values,
 					"Unknown Cause (%u), treated as (41) \"Temporary failure\" for MO-SMS or (111) \"Protocol error,unspecified\" for MT-SMS"));
   curr_offset++;
-  
+
   if ((oct & 0x80)) {
     oct = tvb_get_guint8(tvb, curr_offset);
     proto_tree_add_uint_format(tree, hf_cause_value,
@@ -331,14 +331,14 @@ dissect_camel_camelPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn
   opcode = 0;
   application_context_version = 0;
   if (actx->pinfo->private_data != NULL){
-    p_private_tcap=actx->pinfo->private_data; 
-    
+    p_private_tcap=actx->pinfo->private_data;
+
     if (p_private_tcap->acv==TRUE ){
       version_ptr = strrchr(p_private_tcap->oid,'.');
       if (version_ptr)
 	application_context_version = atoi(version_ptr+1);
     }
-    gp_camelsrt_info->tcap_context=p_private_tcap->context; 
+    gp_camelsrt_info->tcap_context=p_private_tcap->context;
     if (p_private_tcap->context)
       gp_camelsrt_info->tcap_session_id
 
@@ -374,14 +374,14 @@ dissect_camel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
   /* create display subtree for the protocol */
   if(parent_tree){
-     item = proto_tree_add_item(parent_tree, proto_camel, tvb, 0, -1, FALSE);
+     item = proto_tree_add_item(parent_tree, proto_camel, tvb, 0, -1, ENC_NA);
      tree = proto_item_add_subtree(item, ett_camel);
   }
   /* camelsrt reset counter, and initialise global pointer
      to store service response time related data */
   gp_camelsrt_info=camelsrt_razinfo();
   dissect_camel_camelPDU(FALSE, tvb, 0, &asn1_ctx , tree, -1);
-  
+
   /* If a Tcap context is associated to this transaction */
   if (gcamel_HandleSRT &&
       gp_camelsrt_info->tcap_context ) {
@@ -428,7 +428,7 @@ void proto_reg_handoff_camel(void) {
     register_ber_oid_dissector_handle("0.4.0.0.1.21.3.61",camel_handle, proto_camel, "cap3-sms-AC" );
     register_ber_oid_dissector_handle("0.4.0.0.1.23.3.4",camel_handle, proto_camel, "capssf-scfGenericAC" );
     register_ber_oid_dissector_handle("0.4.0.0.1.23.3.61",camel_handle, proto_camel, "cap4-sms-AC" );
-	
+
 
 #include "packet-camel-dis-tab.c"
   } else {
@@ -439,7 +439,7 @@ void proto_reg_handoff_camel(void) {
   ssn_range = range_copy(global_ssn_range);
 
   range_foreach(ssn_range, range_add_callback);
-  
+
 }
 
 void proto_register_camel(void) {
@@ -485,12 +485,12 @@ void proto_register_camel(void) {
       { "RP Cause",  "camel.RP_Cause",
         FT_UINT8, BASE_DEC, NULL, 0,
 	"RP Cause Value", HFILL }},
-    
+
     { &hf_camel_CAMEL_AChBillingChargingCharacteristics,
       { "CAMEL-AChBillingChargingCharacteristics", "camel.CAMEL_AChBillingChargingCharacteristics",
         FT_UINT32, BASE_DEC,  VALS(camel_CAMEL_AChBillingChargingCharacteristics_vals), 0,
-        NULL, HFILL }}, 
-    
+        NULL, HFILL }},
+
     { &hf_camel_CAMEL_FCIBillingChargingCharacteristics,
       { "CAMEL-FCIBillingChargingCharacteristics", "camel.CAMEL_FCIBillingChargingCharacteristics",
         FT_UINT32, BASE_DEC, VALS(camel_CAMEL_FCIBillingChargingCharacteristics_vals), 0,
@@ -630,15 +630,15 @@ void proto_register_camel(void) {
   rose_ctx_init(&camel_rose_ctx);
 
   /* Register dissector tables */
-  camel_rose_ctx.arg_local_dissector_table = register_dissector_table("camel.ros.local.arg", 
-                                                                      "CAMEL Operation Argument (local opcode)", 
-                                                                      FT_UINT32, BASE_HEX); 
-  camel_rose_ctx.res_local_dissector_table = register_dissector_table("camel.ros.local.res", 
-                                                                      "CAMEL Operation Result (local opcode)", 
-                                                                      FT_UINT32, BASE_HEX); 
-  camel_rose_ctx.err_local_dissector_table = register_dissector_table("camel.ros.local.err", 
-                                                                      "CAMEL Error (local opcode)", 
-                                                                      FT_UINT32, BASE_HEX); 
+  camel_rose_ctx.arg_local_dissector_table = register_dissector_table("camel.ros.local.arg",
+                                                                      "CAMEL Operation Argument (local opcode)",
+                                                                      FT_UINT32, BASE_HEX);
+  camel_rose_ctx.res_local_dissector_table = register_dissector_table("camel.ros.local.res",
+                                                                      "CAMEL Operation Result (local opcode)",
+                                                                      FT_UINT32, BASE_HEX);
+  camel_rose_ctx.err_local_dissector_table = register_dissector_table("camel.ros.local.err",
+                                                                      "CAMEL Error (local opcode)",
+                                                                      FT_UINT32, BASE_HEX);
 
   /* Register our configuration options, particularly our ssn:s */
   /* Set default SSNs */
@@ -649,8 +649,8 @@ void proto_register_camel(void) {
   prefs_register_enum_preference(camel_module, "date.format", "Date Format",
                                   "The date format: (DD/MM) or (MM/DD)",
                                   &date_format, date_options, FALSE);
-  
-  
+
+
   prefs_register_range_preference(camel_module, "tcap.ssn",
     "TCAP SSNs",
     "TCAP Subsystem numbers used for Camel",
@@ -665,8 +665,8 @@ void proto_register_camel(void) {
 				 "Persistent stats for SRT",
 				 "Statistics for Response Time",
 				 &gcamel_PersistentSRT);
-  
-  /* Routine for statistic */ 
+
+  /* Routine for statistic */
   register_init_routine(&camelsrt_init_routine);
   camel_tap=register_tap(PSNAME);
 }
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index 7fcde6ef61..4b9b764e96 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -121,7 +121,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	}
 
 	if(parent_tree){
-		item = proto_tree_add_item(parent_tree, proto_cmip, tvb, 0, -1, FALSE);
+		item = proto_tree_add_item(parent_tree, proto_cmip, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_cmip);
 	}
 
@@ -212,7 +212,7 @@ void proto_reg_handoff_cmip(void) {
 	register_ber_oid_dissector("2.9.0.0.2", dissect_cmip, proto_cmip, "cmip");
 	register_ber_oid_dissector("2.9.1.1.4", dissect_cmip, proto_cmip, "joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)");
 
-	oid_add_from_string("2.9.3.2.3.1","managedObjectClass(3) alarmRecord(1)");  
+	oid_add_from_string("2.9.3.2.3.1","managedObjectClass(3) alarmRecord(1)");
 	oid_add_from_string("2.9.3.2.3.2","managedObjectClass(3) attributeValueChangeRecord(2)");
 	oid_add_from_string("2.9.3.2.3.3","managedObjectClass(3) discriminator(3)");
 	oid_add_from_string("2.9.3.2.3.4","managedObjectClass(3) eventForwardingDiscriminator(4)");
diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c
index 8114039e01..43f43eb886 100644
--- a/asn1/cmp/packet-cmp-template.c
+++ b/asn1/cmp/packet-cmp-template.c
@@ -124,7 +124,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
 	col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 
 	if(parent_tree){
-		item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE);
+		item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_cmp);
 	}
 
@@ -133,7 +133,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
 
 	if (pdu_type < 10) {
 		/* RFC2510 TCP transport */
-		ti = proto_tree_add_item(tree, proto_cmp, tvb, offset, 5, FALSE);
+		ti = proto_tree_add_item(tree, proto_cmp, tvb, offset, 5, ENC_NA);
 		tcptrans_tree = proto_item_add_subtree(ti, ett_cmp);
 		proto_tree_add_item(tree, hf_cmp_tcptrans_len, tvb, offset, 4, ENC_BIG_ENDIAN);
 		offset += 4;
@@ -289,7 +289,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 
 	if(parent_tree){
-		item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE);
+		item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_cmp);
 	}
 
diff --git a/asn1/goose/packet-goose-template.c b/asn1/goose/packet-goose-template.c
index 1d218e3e75..80cd0a478b 100644
--- a/asn1/goose/packet-goose-template.c
+++ b/asn1/goose/packet-goose-template.c
@@ -72,7 +72,7 @@ dissect_goose(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
 	if (parent_tree){
-		item = proto_tree_add_item(parent_tree, proto_goose, tvb, 0, -1, FALSE);
+		item = proto_tree_add_item(parent_tree, proto_goose, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_goose);
 	}
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
@@ -153,6 +153,6 @@ void proto_reg_handoff_goose(void) {
 
 	dissector_handle_t goose_handle;
 	goose_handle = find_dissector("goose");
-	
+
 	dissector_add_uint("ethertype", ETHERTYPE_IEC61850_GOOSE, goose_handle);
 }
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 14588f3618..5fbc01e6c1 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -1383,7 +1383,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.248");
 
     if (tree) {
-        h248_item = proto_tree_add_item(tree, proto_h248, tvb, 0, -1, FALSE);
+        h248_item = proto_tree_add_item(tree, proto_h248, tvb, 0, -1, ENC_NA);
         h248_tree = proto_item_add_subtree(h248_item, ett_h248);
     }
 
diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c
index f038cc30ee..293873fcc3 100644
--- a/asn1/h282/packet-h282-template.c
+++ b/asn1/h282/packet-h282-template.c
@@ -60,7 +60,7 @@ dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
 
-  ti = proto_tree_add_item(tree, proto_h282, tvb, 0, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_h282, tvb, 0, -1, ENC_NA);
   h282_tree = proto_item_add_subtree(ti, ett_h282);
 
   return dissect_RDCPDU_PDU(tvb, pinfo, h282_tree);
@@ -93,7 +93,7 @@ void proto_register_h282(void) {
 }
 
 /*--- proto_reg_handoff_h282 -------------------------------------------*/
-void proto_reg_handoff_h282(void) 
+void proto_reg_handoff_h282(void)
 {
 
 }
diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c
index 0a5b46582f..0440ebaa67 100644
--- a/asn1/h283/packet-h283-template.c
+++ b/asn1/h283/packet-h283-template.c
@@ -47,9 +47,9 @@ static int ett_h283 = -1;
 #include "packet-h283-ett.c"
 
 /* Subdissectors */
-static dissector_handle_t rdc_pdu_handle; 
-static dissector_handle_t rdc_device_list_handle; 
-static dissector_handle_t data_handle; 
+static dissector_handle_t rdc_pdu_handle;
+static dissector_handle_t rdc_device_list_handle;
+static dissector_handle_t data_handle;
 
 static gboolean info_is_set;
 
@@ -65,7 +65,7 @@ dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   info_is_set = FALSE;
 
-  ti = proto_tree_add_item(tree, proto_h283, tvb, 0, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_h283, tvb, 0, -1, ENC_NA);
   h283_tree = proto_item_add_subtree(ti, ett_h283);
 
   return dissect_LCTPDU_PDU(tvb, pinfo, h283_tree);
@@ -97,12 +97,12 @@ void proto_register_h283(void) {
 }
 
 /*--- proto_reg_handoff_h283 -------------------------------------------*/
-void proto_reg_handoff_h283(void) 
+void proto_reg_handoff_h283(void)
 {
-  dissector_handle_t h283_udp_handle; 
+  dissector_handle_t h283_udp_handle;
 
   h283_udp_handle = find_dissector(PFNAME);
-  dissector_add_handle("udp.port", h283_udp_handle); 
+  dissector_add_handle("udp.port", h283_udp_handle);
 
   rdc_pdu_handle = find_dissector("rdc");
   rdc_device_list_handle = find_dissector("rdc.device_list");
diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c
index 55e337ae2a..2ac3b8c270 100644
--- a/asn1/h501/packet-h501-template.c
+++ b/asn1/h501/packet-h501-template.c
@@ -70,7 +70,7 @@ dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
 
-  ti = proto_tree_add_item(tree, proto_h501, tvb, 0, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_h501, tvb, 0, -1, ENC_NA);
   h501_tree = proto_item_add_subtree(ti, ett_h501);
 
   return dissect_Message_PDU(tvb, pinfo, h501_tree);
@@ -131,7 +131,7 @@ void proto_register_h501(void) {
 }
 
 /*--- proto_reg_handoff_h501 -------------------------------------------*/
-void proto_reg_handoff_h501(void) 
+void proto_reg_handoff_h501(void)
 {
   static gboolean h501_prefs_initialized = FALSE;
   static dissector_handle_t h501_udp_handle;
diff --git a/asn1/hnbap/packet-hnbap-template.c b/asn1/hnbap/packet-hnbap-template.c
index 18639af3c5..d8edec1364 100644
--- a/asn1/hnbap/packet-hnbap-template.c
+++ b/asn1/hnbap/packet-hnbap-template.c
@@ -137,7 +137,7 @@ dissect_hnbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "HNBAP");
 
     /* create the hnbap protocol tree */
-    hnbap_item = proto_tree_add_item(tree, proto_hnbap, tvb, 0, -1, FALSE);
+    hnbap_item = proto_tree_add_item(tree, proto_hnbap, tvb, 0, -1, ENC_NA);
     hnbap_tree = proto_item_add_subtree(hnbap_item, ett_hnbap);
 
     dissect_HNBAP_PDU_PDU(tvb, pinfo, hnbap_tree);
diff --git a/asn1/idmp/packet-idmp-template.c b/asn1/idmp/packet-idmp-template.c
index 447a50af92..fd86a4e0cf 100644
--- a/asn1/idmp/packet-idmp-template.c
+++ b/asn1/idmp/packet-idmp-template.c
@@ -172,7 +172,7 @@ static void dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t
 	top_tree=parent_tree;
 
 	if(parent_tree){
-		item = proto_tree_add_item(parent_tree, proto_idmp, tvb, 0, -1, FALSE);
+		item = proto_tree_add_item(parent_tree, proto_idmp, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_idmp);
 	}
 
diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c
index f0e6409f36..b6d5979e55 100644
--- a/asn1/inap/packet-inap-template.c
+++ b/asn1/inap/packet-inap-template.c
@@ -138,7 +138,7 @@ dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
     /* create display subtree for the protocol */
     if(parent_tree){
-       item = proto_tree_add_item(parent_tree, proto_inap, tvb, 0, -1, FALSE);
+       item = proto_tree_add_item(parent_tree, proto_inap, tvb, 0, -1, ENC_NA);
        tree = proto_item_add_subtree(item, ett_inap);
     }
 	inap_pdu_type = tvb_get_guint8(tvb, offset)&0x0f;
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c
index f3b383f29a..236bda0112 100644
--- a/asn1/kerberos/packet-kerberos-template.c
+++ b/asn1/kerberos/packet-kerberos-template.c
@@ -1318,9 +1318,9 @@ dissect_krb5_PW_SALT(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 /* Make wrappers around exported functions for now */
 int
 dissect_krb5_Checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
-{	
+{
 	return dissect_kerberos_Checksum(FALSE, tvb, offset, actx, tree, hf_kerberos_cksum);
-	
+
 }
 
 int
@@ -1330,12 +1330,12 @@ dissect_krb5_ctime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
 }
 
 
-int 
+int
 dissect_krb5_cname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 	return dissect_kerberos_PrincipalName(FALSE, tvb, offset, actx, tree, hf_kerberos_cname);
 }
-int 
+int
 dissect_krb5_realm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 	return dissect_kerberos_Realm(FALSE, tvb, offset, actx, tree, hf_kerberos_realm);
@@ -1375,7 +1375,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
 	}
         if (tree) {
-            item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE);
+            item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, ENC_NA);
             kerberos_tree = proto_item_add_subtree(item, ett_kerberos);
         }
 	show_krb_recordmark(kerberos_tree, tvb, offset, krb_rm);
@@ -1426,7 +1426,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             col_clear(pinfo->cinfo, COL_INFO);
         }
         if (tree) {
-            item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE);
+            item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, ENC_NA);
             kerberos_tree = proto_item_add_subtree(item, ett_kerberos);
         }
     }
diff --git a/asn1/lcsap/packet-lcsap-template.c b/asn1/lcsap/packet-lcsap-template.c
index 640f79d2c2..5b00246123 100644
--- a/asn1/lcsap/packet-lcsap-template.c
+++ b/asn1/lcsap/packet-lcsap-template.c
@@ -25,7 +25,7 @@
  * References:
  * ETSI TS 129 171 V9.2.0 (2010-10)
  */
- 
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -132,9 +132,9 @@ dissect_lcsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "LCSAP");
 
 	/* create the lcsap protocol tree */
-	lcsap_item = proto_tree_add_item(tree, proto_lcsap, tvb, 0, -1, FALSE);
+	lcsap_item = proto_tree_add_item(tree, proto_lcsap, tvb, 0, -1, ENC_NA);
 	lcsap_tree = proto_item_add_subtree(lcsap_item, ett_lcsap);
-	
+
 	dissect_LCS_AP_PDU_PDU(tvb, pinfo, lcsap_tree);
 }
 
@@ -148,7 +148,7 @@ proto_reg_handoff_lcsap(void)
 
 	if (!Initialized) {
 		lcsap_handle = find_dissector("lcsap");
-		
+
 		dissector_add_handle("sctp.port", lcsap_handle);   /* for "decode-as"  */
 		dissector_add_uint("sctp.ppi", LCS_AP_PAYLOAD_PROTOCOL_ID,   lcsap_handle);
 		Initialized=TRUE;
@@ -191,13 +191,13 @@ void proto_register_lcsap(void) {
 
   /* Register dissector tables */
   lcsap_ies_dissector_table = register_dissector_table("lcsap.ies", "LCS-AP-PROTOCOL-IES", FT_UINT32, BASE_DEC);
-  
+
 
   lcsap_extension_dissector_table = register_dissector_table("lcsap.extension", "LCS-AP-PROTOCOL-EXTENSION", FT_UINT32, BASE_DEC);
   lcsap_proc_imsg_dissector_table = register_dissector_table("lcsap.proc.imsg", "LCS-AP-ELEMENTARY-PROCEDURE InitiatingMessage", FT_UINT32, BASE_DEC);
   lcsap_proc_sout_dissector_table = register_dissector_table("lcsap.proc.sout", "LCS-AP-ELEMENTARY-PROCEDURE SuccessfulOutcome", FT_UINT32, BASE_DEC);
   lcsap_proc_uout_dissector_table = register_dissector_table("lcsap.proc.uout", "LCS-AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC);
-  
+
   /* Register configuration options for ports */
   lcsap_module = prefs_register_protocol(proto_lcsap, proto_reg_handoff_lcsap);
 
diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c
index ed441ce3bc..0e05d2c4ad 100644
--- a/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -248,7 +248,7 @@ dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_clear(pinfo->cinfo, COL_INFO);
 	if (tree) {
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE);
+		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
 		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
 		dissect_DL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree);
 	}
@@ -264,7 +264,7 @@ dissect_lte_rrc_DL_DCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_clear(pinfo->cinfo, COL_INFO);
 	if (tree) {
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE);
+		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
 		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
 		dissect_DL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree);
 	}
@@ -281,7 +281,7 @@ dissect_lte_rrc_UL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_clear(pinfo->cinfo, COL_INFO);
 	if (tree) {
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE);
+		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
 		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
 		dissect_UL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree);
 	}
@@ -297,7 +297,7 @@ dissect_lte_rrc_UL_DCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_clear(pinfo->cinfo, COL_INFO);
 	if (tree) {
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE);
+		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
 		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
 		dissect_UL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree);
 	}
@@ -313,12 +313,12 @@ dissect_lte_rrc_BCCH_BCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_clear(pinfo->cinfo, COL_INFO);
 	if (tree) {
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE);
+		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
 		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
 		dissect_BCCH_BCH_Message_PDU(tvb, pinfo, lte_rrc_tree);
 	}
 }
- 
+
 static void
 dissect_lte_rrc_BCCH_DL_SCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
@@ -329,7 +329,7 @@ dissect_lte_rrc_BCCH_DL_SCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_clear(pinfo->cinfo, COL_INFO);
 	if (tree) {
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE);
+		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
 		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
 		dissect_BCCH_DL_SCH_Message_PDU(tvb, pinfo, lte_rrc_tree);
 	}
diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c
index 58fcd8d478..054fe4ac20 100644
--- a/asn1/mms/packet-mms-template.c
+++ b/asn1/mms/packet-mms-template.c
@@ -67,7 +67,7 @@ dissect_mms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
 	if(parent_tree){
-		item = proto_tree_add_item(parent_tree, proto_mms, tvb, 0, -1, FALSE);
+		item = proto_tree_add_item(parent_tree, proto_mms, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mms);
 	}
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS");
@@ -87,7 +87,7 @@ dissect_mms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
 /*--- proto_register_mms -------------------------------------------*/
 void proto_register_mms(void) {
-	
+
 	/* List of fields */
   static hf_register_info hf[] =
   {
@@ -113,7 +113,7 @@ void proto_register_mms(void) {
 
 static gboolean
 dissect_mms_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
-{	
+{
 	/* must check that this really is an mms packet */
 	int offset = 0;
 	guint32 length = 0 ;
@@ -123,40 +123,40 @@ dissect_mms_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	gint8 tmp_class;
 	gboolean tmp_pc;
 	gint32 tmp_tag;
-	
+
 		/* first, check do we have at least 2 bytes (pdu) */
 	if (!tvb_bytes_exist(tvb, 0, 2))
 		return FALSE;	/* no */
-	
+
 	/* can we recognize MMS PDU ? Return FALSE if  not */
 	/*   get MMS PDU type */
 	offset = get_ber_identifier(tvb, offset, &tmp_class, &tmp_pc, &tmp_tag);
-	
+
 	/* check MMS type */
-	
-	/* Class should be constructed */ 
+
+	/* Class should be constructed */
 	if (tmp_class!=BER_CLASS_CON)
 		return FALSE;
-	
+
 	/* see if the tag is a valid MMS PDU */
 	match_strval_idx(tmp_tag, mms_MMSpdu_vals, &idx);
-	if  (idx == -1) { 
+	if  (idx == -1) {
 	 	return FALSE;  /* no, it isn't an MMS PDU */
 	}
-	
+
 	/* check MMS length  */
 	oct = tvb_get_guint8(tvb, offset)& 0x7F;
 	if (oct==0)
 		/* MMS requires length after tag so not MMS if indefinite length*/
 		return FALSE;
-						
+
 	offset = get_ber_length(tvb, offset, &length, NULL);
 	/* do we have enough bytes? */
 	if (!tvb_bytes_exist(tvb, offset, length))
-		return FALSE; 
-		
+		return FALSE;
+
 	dissect_mms(tvb, pinfo, parent_tree);
-	return TRUE;	
+	return TRUE;
 }
 
 /*--- proto_reg_handoff_mms --- */
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c
index 06bf361cc8..2113a133d8 100644
--- a/asn1/mpeg-pes/packet-mpeg-pes-template.c
+++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c
@@ -558,7 +558,7 @@ dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG");
 	col_clear(pinfo->cinfo, COL_INFO);
 	if (tree)
-	    proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, FALSE);
+	    proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, ENC_NA);
     }
 }
 
diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c
index f8f761b794..a1b3dfaf2e 100644
--- a/asn1/nbap/packet-nbap-template.c
+++ b/asn1/nbap/packet-nbap-template.c
@@ -120,9 +120,9 @@ dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBAP");
 
 	/* create the nbap protocol tree */
-	nbap_item = proto_tree_add_item(tree, proto_nbap, tvb, 0, -1, FALSE);
+	nbap_item = proto_tree_add_item(tree, proto_nbap, tvb, 0, -1, ENC_NA);
 	nbap_tree = proto_item_add_subtree(nbap_item, ett_nbap);
-	
+
 	dissect_NBAP_PDU_PDU(tvb, pinfo, nbap_tree);
 }
 
@@ -157,7 +157,7 @@ void proto_register_nbap(void) {
   /* Register fields and subtrees */
   proto_register_field_array(proto_nbap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
- 
+
   /* Register dissector */
   register_dissector("nbap", dissect_nbap, proto_nbap);
 
diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c
index 8ec3dbafaf..c6fa93060f 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.c
@@ -72,7 +72,7 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
 
 	if(parent_tree){
-		item=proto_tree_add_item(parent_tree, proto_ocsp, tvb, 0, -1, FALSE);
+		item=proto_tree_add_item(parent_tree, proto_ocsp, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_ocsp);
 	}
 
@@ -94,7 +94,7 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
 
 
 	if(parent_tree){
-		item=proto_tree_add_item(parent_tree, proto_ocsp, tvb, 0, -1, FALSE);
+		item=proto_tree_add_item(parent_tree, proto_ocsp, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_ocsp);
 	}
 
diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c
index 791558c49c..ffa5342115 100644
--- a/asn1/pcap/packet-pcap-template.c
+++ b/asn1/pcap/packet-pcap-template.c
@@ -135,9 +135,9 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAP");
 
 	/* create the pcap protocol tree */
-	pcap_item = proto_tree_add_item(tree, proto_pcap, tvb, 0, -1, FALSE);
+	pcap_item = proto_tree_add_item(tree, proto_pcap, tvb, 0, -1, ENC_NA);
 	pcap_tree = proto_item_add_subtree(pcap_item, ett_pcap);
-	
+
 	dissect_PCAP_PDU_PDU(tvb, pinfo, pcap_tree);
 }
 
@@ -201,7 +201,7 @@ void proto_register_pcap(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
   pcap_module = prefs_register_protocol(proto_pcap, proto_reg_handoff_pcap);
- 
+
   /* Register dissector */
   register_dissector("pcap", dissect_pcap, proto_pcap);
 
diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c
index 4ba7262f44..21b68ef08b 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.c
+++ b/asn1/pkixtsp/packet-pkixtsp-template.c
@@ -67,7 +67,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
 
 	if(parent_tree){
-		item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, FALSE);
+		item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_pkixtsp);
 	}
 
@@ -88,7 +88,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
 
 	if(parent_tree){
-		item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, FALSE);
+		item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_pkixtsp);
 	}
 
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index 30d80b10b8..21c0945051 100644
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -398,7 +398,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     return offset;
   service = get_service(opcode);
 
-  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
+  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA);
   qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode);
@@ -449,7 +449,7 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     return offset;
   service = get_service(opcode);
 
-  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
+  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA);
   qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode);
@@ -499,7 +499,7 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   if (!err_ptr)
     return offset;
 
-  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), FALSE);
+  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA);
   qsig_tree = proto_item_add_subtree(ti, ett_qsig);
 
   proto_tree_add_uint(qsig_tree, hf_qsig_error, tvb, 0, 0, errcode);
@@ -547,7 +547,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset
 
   offset = 0;
 
-  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, ENC_NA);
   PROTO_ITEM_SET_HIDDEN(ti);
 
   ie_type = tvb_get_guint8(tvb, offset);
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index 04793b87aa..2d67a541f5 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -237,7 +237,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP");
 
 	/* create the ranap protocol tree */
-	ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, FALSE);
+	ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, ENC_NA);
 	ranap_tree = proto_item_add_subtree(ranap_item, ett_ranap);
 
 	dissect_RANAP_PDU_PDU(tvb, pinfo, ranap_tree);
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c
index 9e074b616f..b46da22a60 100644
--- a/asn1/rrc/packet-rrc-template.c
+++ b/asn1/rrc/packet-rrc-template.c
@@ -135,7 +135,7 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRC");
 
 	/* create the rrc protocol tree */
-	rrc_item = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, FALSE);
+	rrc_item = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA);
 	rrc_tree = proto_item_add_subtree(rrc_item, ett_rrc);
 
 	if (rrcinf) {
diff --git a/asn1/rua/packet-rua-template.c b/asn1/rua/packet-rua-template.c
index bda78611a6..a58b172148 100644
--- a/asn1/rua/packet-rua-template.c
+++ b/asn1/rua/packet-rua-template.c
@@ -122,9 +122,9 @@ dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "RUA");
 
     /* create the rua protocol tree */
-    rua_item = proto_tree_add_item(tree, proto_rua, tvb, 0, -1, FALSE);
+    rua_item = proto_tree_add_item(tree, proto_rua, tvb, 0, -1, ENC_NA);
     rua_tree = proto_item_add_subtree(rua_item, ett_rua);
-    
+
     dissect_RUA_PDU_PDU(tvb, pinfo, rua_tree);
 }
 
@@ -151,7 +151,7 @@ module_t *rua_module;
   /* Register fields and subtrees */
   proto_register_field_array(proto_rua, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
- 
+
   /* Register dissector */
   register_dissector("rua", dissect_rua, proto_rua);
 
@@ -161,7 +161,7 @@ module_t *rua_module;
   rua_proc_imsg_dissector_table = register_dissector_table("rua.proc.imsg", "RUA-ELEMENTARY-PROCEDURE InitiatingMessage", FT_UINT32, BASE_DEC);
   rua_proc_sout_dissector_table = register_dissector_table("rua.proc.sout", "RUA-ELEMENTARY-PROCEDURE SuccessfulOutcome", FT_UINT32, BASE_DEC);
   rua_proc_uout_dissector_table = register_dissector_table("rua.proc.uout", "RUA-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC);
- 
+
   rua_module = prefs_register_protocol(proto_rua, proto_reg_handoff_rua);
   prefs_register_uint_preference(rua_module, "port", "RUA SCTP Port", "Set the port for RUA messages (Default of 29169)", 10, &global_sctp_port);
 
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index bdf3f2ad92..d2b3042876 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -168,9 +168,9 @@ dissect_s1ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "S1AP");
 
 	/* create the s1ap protocol tree */
-	s1ap_item = proto_tree_add_item(tree, proto_s1ap, tvb, 0, -1, FALSE);
+	s1ap_item = proto_tree_add_item(tree, proto_s1ap, tvb, 0, -1, ENC_NA);
 	s1ap_tree = proto_item_add_subtree(s1ap_item, ett_s1ap);
-	
+
 	dissect_S1AP_PDU_PDU(tvb, pinfo, s1ap_tree);
 }
 
@@ -238,7 +238,7 @@ void proto_register_s1ap(void) {
   /* Register fields and subtrees */
   proto_register_field_array(proto_s1ap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
- 
+
   /* Register dissector */
   register_dissector("s1ap", dissect_s1ap, proto_s1ap);
 
@@ -250,7 +250,7 @@ void proto_register_s1ap(void) {
   s1ap_proc_imsg_dissector_table = register_dissector_table("s1ap.proc.imsg", "S1AP-ELEMENTARY-PROCEDURE InitiatingMessage", FT_UINT32, BASE_DEC);
   s1ap_proc_sout_dissector_table = register_dissector_table("s1ap.proc.sout", "S1AP-ELEMENTARY-PROCEDURE SuccessfulOutcome", FT_UINT32, BASE_DEC);
   s1ap_proc_uout_dissector_table = register_dissector_table("s1ap.proc.uout", "S1AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC);
-  
+
   /* Register configuration options for ports */
   s1ap_module = prefs_register_protocol(proto_s1ap, proto_reg_handoff_s1ap);
 
diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c
index 457cd9f552..20d07d6277 100644
--- a/asn1/sabp/packet-sabp-template.c
+++ b/asn1/sabp/packet-sabp-template.c
@@ -148,7 +148,7 @@ dissect_sabp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
 
 	/* create the sbap protocol tree */
-	sabp_item = proto_tree_add_item(tree, proto_sabp, tvb, 0, -1, FALSE);
+	sabp_item = proto_tree_add_item(tree, proto_sabp, tvb, 0, -1, ENC_NA);
 	sabp_tree = proto_item_add_subtree(sabp_item, ett_sabp);
 
 	dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree);
diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c
index aa6028b00c..ca400b9214 100644
--- a/asn1/smrse/packet-smrse-template.c
+++ b/asn1/smrse/packet-smrse-template.c
@@ -91,7 +91,7 @@ dissect_smrse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 		return 0;
 
 	if(parent_tree){
-		item = proto_tree_add_item(parent_tree, proto_smrse, tvb, 0, -1, FALSE);
+		item = proto_tree_add_item(parent_tree, proto_smrse, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_smrse);
 	}
 
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 2c9b041ebd..b74427bf2d 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1781,7 +1781,7 @@ dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX");
 
 	if (tree) {
-		item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_BIG_ENDIAN);
+		item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_NA);
 		smux_tree = proto_item_add_subtree(item, ett_smux);
 	}
 
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index 626713d683..a07c19cb2b 100644
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -1245,7 +1245,7 @@ dissect_spnego_wrap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
 	item = proto_tree_add_item(tree, proto_spnego, tvb, offset,
-				   -1, FALSE);
+				   -1, ENC_NA);
 
 	subtree = proto_item_add_subtree(item, ett_spnego);
 	/*
@@ -1298,7 +1298,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	}
 
 	item = proto_tree_add_item(parent_tree, proto_spnego, tvb, offset,
-				   -1, FALSE);
+				   -1, ENC_NA);
 
 	subtree = proto_item_add_subtree(item, ett_spnego);
 
diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c
index ffbfb2fe52..1f043137c7 100644
--- a/asn1/sv/packet-sv-template.c
+++ b/asn1/sv/packet-sv-template.c
@@ -201,7 +201,7 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
 	if (parent_tree){
-		item = proto_tree_add_item(parent_tree, proto_sv, tvb, 0, -1, FALSE);
+		item = proto_tree_add_item(parent_tree, proto_sv, tvb, 0, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_sv);
 	}
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c
index 876d9dea88..f15a86a636 100644
--- a/asn1/t124/packet-t124-template.c
+++ b/asn1/t124/packet-t124-template.c
@@ -88,7 +88,7 @@ register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto)
 void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId, dissector_t dissector, int proto)
 {
   /* XXX: we should keep the sub-dissectors list per conversation
-     as the same channels may be used. 
+     as the same channels may be used.
      While we are just using RDP over T.124, then we can get away with it.
   */
 
@@ -131,7 +131,7 @@ dissect_t124_new(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree)
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125");
   col_clear(pinfo->cinfo, COL_INFO);
 
-  item = proto_tree_add_item(parent_tree, proto_t124, tvb, 0, tvb_length(tvb), FALSE);
+  item = proto_tree_add_item(parent_tree, proto_t124, tvb, 0, tvb_length(tvb), ENC_NA);
   tree = proto_item_add_subtree(item, ett_t124);
 
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
@@ -157,7 +157,7 @@ dissect_t124_heur(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree
 
   (void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, -1, -1, t124Heur_sequence);
 
-  if((t124Identifier != NULL) && 
+  if((t124Identifier != NULL) &&
      (strcmp(t124Identifier, "0.0.20.124.0.1") == 0)) {
 
     dissect_t124(tvb, pinfo, parent_tree);
@@ -209,7 +209,7 @@ void proto_register_t124(void) {
   /* suppress some warnings */
   warning_suppressor = dissect_t124_GCCPDU;
   warning_suppressor = dissect_t124_ConnectMCSPDU;
-  
+
 }
 
 void
diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c
index 4940c12f4f..c2ab2f7e90 100644
--- a/asn1/t125/packet-t125-template.c
+++ b/asn1/t125/packet-t125-template.c
@@ -73,7 +73,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree)
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125");
   col_clear(pinfo->cinfo, COL_INFO);
 
-  item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), FALSE);
+  item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), ENC_NA);
   tree = proto_item_add_subtree(item, ett_t125);
 
   get_ber_identifier(tvb, 0, &class, &pc, &tag);
@@ -104,7 +104,7 @@ dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree
   /* or PER */
   dissect_per_constrained_integer(tvb, 0, &asn1_ctx,
 				  NULL, hf_t125_heur, 0, 42,
-				  &choice_index, FALSE); 
+				  &choice_index, FALSE);
 
   /* is this strong enough ? */
   if ( ((class==BER_CLASS_APP) && ((tag>=101) && (tag<=104))) ||
diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c
index 730555f72e..877fe934f0 100644
--- a/asn1/x2ap/packet-x2ap-template.c
+++ b/asn1/x2ap/packet-x2ap-template.c
@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * Ref: 
+ * Ref:
  * 3GPP TS 36.423 V9.2.0 (2010-03)
  */
 
@@ -125,9 +125,9 @@ dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "X2AP");
 
 	/* create the x2ap protocol tree */
-	x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, FALSE);
+	x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, ENC_NA);
 	x2ap_tree = proto_item_add_subtree(x2ap_item, ett_x2ap);
-	
+
 	dissect_X2AP_PDU_PDU(tvb, pinfo, x2ap_tree);
 }
 
@@ -163,7 +163,7 @@ void proto_register_x2ap(void) {
   /* Register fields and subtrees */
   proto_register_field_array(proto_x2ap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
- 
+
   /* Register dissector */
   register_dissector("x2ap", dissect_x2ap, proto_x2ap);