Fix encoding-arg mostly for FT_UINT_STRING; Also: Do misc as needed.

Misc: (as needed)
- Add editor modelines;
- Adjust whitespace.

Change-Id: I0e5d877a2a6273842ad8e771ac0c0acbfcb83200
Reviewed-on: https://code.wireshark.org/review/4173
Reviewed-by: Bill Meier <wmeier@newsguy.com>

16 files changed, 149 insertions, 70 deletions

diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index a4a0615f09..e7abe9b16e 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -3483,7 +3483,7 @@ dissect_reply_afp_map_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
 		}
 	}
 	if (size) {
-	    proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, size, ENC_ASCII|ENC_NA);
+	    proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, size, ENC_ASCII|ENC_BIG_ENDIAN);
 	}
 	else {
 	    proto_tree_add_item(tree, hf_afp_unknown, tvb, offset, len, ENC_NA);
@@ -3521,7 +3521,7 @@ dissect_query_afp_map_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 		len = tvb_get_guint8(tvb, offset);
 		break;
 	}
-	proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, size, ENC_ASCII|ENC_NA);
+	proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, size, ENC_ASCII|ENC_BIG_ENDIAN);
 	offset += len +size;
 
 	return offset;
@@ -4232,7 +4232,7 @@ static const char *spotlight_get_cpx_qtype_string(guint64 cpx_query_type)
 
 static gint
 spotlight_dissect_query_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset,
-                             guint64 cpx_query_type, gint count, gint toc_offset, guint encoding)
+			     guint64 cpx_query_type, gint count, gint toc_offset, guint encoding)
 {
 	gint i, j;
 	gint subquery_count;
@@ -4546,7 +4546,7 @@ dissect_spotlight(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
 	toc_entries -= 1;
 	sub_tree_toc = proto_tree_add_subtree_format(tree, tvb, offset,
 				       (gint)querylen - (gint)toc_offset,
-                       ett_afp_spotlight_toc, NULL,
+				       ett_afp_spotlight_toc, NULL,
 				       "Complex types ToC (%u entries)",
 				       toc_entries);
 	proto_tree_add_text(sub_tree_toc, tvb, offset, 2, "Number of entries (%u)", toc_entries);
@@ -4939,7 +4939,7 @@ dissect_afp_server_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 
 	offset = AFPSTATUS_PRELEN;
 	server_name_len = tvb_get_guint8(tvb, offset);
-	proto_tree_add_item(tree, hf_afp_server_name, tvb, offset, 1, ENC_ASCII|ENC_NA);
+	proto_tree_add_item(tree, hf_afp_server_name, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 	offset += 1 + server_name_len;	/* 1 for the length byte */
 
 	if ((flag & AFPSRVRINFO_SRVSIGNATURE)) {
@@ -4986,7 +4986,7 @@ dissect_afp_server_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 	offset = tvb_get_ntohs(tvb, AFPSTATUS_MACHOFF);
 	if (offset) {
 		if (offset >= variable_data_offset) {
-			proto_tree_add_item(tree, hf_afp_server_type, tvb, offset, 1, ENC_ASCII|ENC_NA);
+			proto_tree_add_item(tree, hf_afp_server_type, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 		}
 	}
 
@@ -4999,7 +4999,7 @@ dissect_afp_server_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 			offset++;
 			for (i = 0; i < nbe; i++) {
 				len = tvb_get_guint8(tvb, offset);
-				proto_tree_add_item(sub_tree, hf_afp_server_vers, tvb, offset, 1, ENC_ASCII|ENC_NA);
+				proto_tree_add_item(sub_tree, hf_afp_server_vers, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 				offset += len + 1;
 			}
 		}
@@ -5014,7 +5014,7 @@ dissect_afp_server_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 			offset++;
 			for (i = 0; i < nbe; i++) {
 				len = tvb_get_guint8(tvb, offset);
-				proto_tree_add_item(sub_tree, hf_afp_server_uams, tvb, offset, 1, ENC_ASCII|ENC_NA);
+				proto_tree_add_item(sub_tree, hf_afp_server_uams, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 				offset += len + 1;
 			}
 		}
@@ -5144,7 +5144,7 @@ dissect_afp_server_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 			offset++;
 			for (i = 0; i < nbe; i++) {
 				len = tvb_get_guint8(tvb, offset);
-				proto_tree_add_item(sub_tree, hf_afp_server_directory, tvb, offset, 1, ENC_ASCII|ENC_NA);
+				proto_tree_add_item(sub_tree, hf_afp_server_directory, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 				offset += len + 1;
 			}
 		}
@@ -7315,3 +7315,16 @@ proto_reg_handoff_afp(void)
 /* -------------------------------
 	end
 */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 9ace99968b..22c0b37a28 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -518,7 +518,7 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree,
   int   len;
 
   len = tvb_get_guint8(tvb, offset);
-  proto_tree_add_item(tree, hf_index, tvb, offset, 1, ENC_ASCII|ENC_NA);
+  proto_tree_add_item(tree, hf_index, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 
   offset += (len+1);
 
@@ -1238,7 +1238,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
       sub_tree = proto_item_add_subtree(ti, ett_zip_zones_list);
       for (i = 0; i < count; i++) {
         len = tvb_get_guint8(tvb, offset);
-        proto_tree_add_item(sub_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_NA);
+        proto_tree_add_item(sub_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
         offset += len +1;
       }
       break;
@@ -1305,7 +1305,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     offset += 4;
 
     len = tvb_get_guint8(tvb, offset);
-    proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_NA);
+    proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
     offset += len +1;
 
     len = tvb_get_guint8(tvb, offset);
@@ -1314,7 +1314,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_tree_add_item(zip_tree, hf_zip_multicast_address,tvb, offset, len,ENC_NA);
     offset += len;
 
-    proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_NA);
+    proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
     break;
 
   case 2: /* Reply */
@@ -1329,7 +1329,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       proto_tree_add_item(net_tree, hf_zip_network, tvb, offset, 2, ENC_BIG_ENDIAN);
       offset += 2;
       len = tvb_get_guint8(tvb, offset);
-      proto_tree_add_item(net_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_NA);
+      proto_tree_add_item(net_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
       offset += len +1;
       proto_item_set_len(ti, len+3);
     }
@@ -1340,7 +1340,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     offset++;
     proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 4, ENC_NA);
     offset += 4;
-    proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_NA);
+    proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
     break;
 
   case 6 :  /* GetNetInfo reply */
@@ -1355,7 +1355,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     offset += 2;
 
     len = tvb_get_guint8(tvb, offset);
-    proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_NA);
+    proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
     offset += len +1;
 
     len = tvb_get_guint8(tvb, offset);
@@ -1364,7 +1364,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_tree_add_item(zip_tree, hf_zip_multicast_address,tvb, offset, len,ENC_NA);
     offset += len;
     if ((flag & 0x80) != 0)
-      proto_tree_add_item(zip_tree, hf_zip_default_zone, tvb, offset, 1,ENC_ASCII|ENC_NA);
+      proto_tree_add_item(zip_tree, hf_zip_default_zone, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
     break;
 
   default:
diff --git a/epan/dissectors/packet-chargen.c b/epan/dissectors/packet-chargen.c
index f8dcb5e4a0..91ba403d15 100644
--- a/epan/dissectors/packet-chargen.c
+++ b/epan/dissectors/packet-chargen.c
@@ -68,7 +68,7 @@ dissect_chargen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_tree_add_string_format(chargen_tree, hf_chargen_data, tvb, 0,
 		len, "Data", "Data (%u): %s", len, data);
 
-/*	proto_tree_add_item(chargen_tree, hf_chargen_data, tvb, 0, -1, ENC_BIG_ENDIAN); */
+/*	proto_tree_add_item(chargen_tree, hf_chargen_data, tvb, 0, -1, ENC_ASCII|ENC_NA); */
 }
 
 void
diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c
index db65844e75..f0f041e79d 100644
--- a/epan/dissectors/packet-dvb-ait.c
+++ b/epan/dissectors/packet-dvb-ait.c
@@ -199,7 +199,7 @@ dissect_dvb_ait_app_name_desc_body(tvbuff_t *tvb, guint offset,
         len = tvb_get_guint8(tvb, offset);
           /* FT_UINT_STRING with 1 leading len byte */
           proto_tree_add_item(tree, hf_dvb_ait_descr_app_name_name,
-              tvb, offset, 1, ENC_ASCII|ENC_NA);
+              tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
           offset += 1+len;
     }
 
@@ -251,7 +251,7 @@ dissect_dvb_ait_trpt_proto_desc_body(tvbuff_t *tvb, guint offset,
             url_base_len = tvb_get_guint8(tvb, offset);
             /* FT_UINT_STRING with one leading length byte */
             proto_tree_add_item(tree, hf_dvb_ait_descr_trpt_sel_url_base,
-                tvb, offset, 1, ENC_ASCII|ENC_NA);
+                tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
             offset += 1+url_base_len;
 
             url_ext_cnt = tvb_get_guint8(tvb, offset);
@@ -262,7 +262,7 @@ dissect_dvb_ait_trpt_proto_desc_body(tvbuff_t *tvb, guint offset,
             for (i=0; i<url_ext_cnt; i++) {
                 url_ext_len = tvb_get_guint8(tvb, offset);
                 proto_tree_add_item(tree, hf_dvb_ait_descr_trpt_sel_url_ext,
-                        tvb, offset, 1, ENC_ASCII|ENC_NA);
+                        tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
                 offset += 1+url_ext_len;
             }
         }
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index f7dfe2987c..632576f02d 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -4008,7 +4008,7 @@ dissect_dvbci_payload_opp(guint32 tag, gint len_field _U_,
           offset += 3;
           /* hf_dvbci_prof_name is an FT_UINT_STRING, one leading len byte */
           proto_tree_add_item(tree, hf_dvbci_prof_name,
-              tvb, offset, 1, ENC_ASCII|ENC_NA);
+              tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
           break;
         case T_OPERATOR_SEARCH_START:
           proto_tree_add_item(tree, hf_dvbci_unattended,
diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c
index dcb5e03978..a952234469 100644
--- a/epan/dissectors/packet-eiss.c
+++ b/epan/dissectors/packet-eiss.c
@@ -204,7 +204,7 @@ dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
 					2, ENC_BIG_ENDIAN);
 		offset += 2;
 		proto_tree_add_item(sub_tree, hf_eiss_irl_string, tvb, offset, 2,
-					ENC_ASCII|ENC_NA);
+					ENC_ASCII|ENC_BIG_ENDIAN);
 		return (2+total_length);
 	} else if (0xe1 == tag) {
 		sub_tree = proto_tree_add_subtree(tree, tvb, offset, 6,
@@ -583,3 +583,15 @@ proto_reg_handoff_eiss(void)
 	data_handle = find_dissector("data");
 }
 
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c
index 7375a4a331..80aea12700 100644
--- a/epan/dissectors/packet-elcom.c
+++ b/epan/dissectors/packet-elcom.c
@@ -50,9 +50,11 @@
 #define SUFFIX_LEN  2
 #define TOTAL_LEN (LOWADR_LEN + SUFFIX_LEN + 2)
 
+#if 0 /* ??? */
 #define ELCOM_UNKNOWN_ENDIAN 0
 #define ELCOM_LITTLE_ENDIAN  1
 #define ELCOM_BIG_ENDIAN     2
+#endif
 
 void proto_register_elcom(void);
 void proto_reg_handoff_elcom(void);
@@ -217,7 +219,8 @@ dissect_lower_address(proto_item *ti_arg, gint ett_arg,
 
         /* SUFFIX */
         suffix = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, len2, ENC_ASCII);
-        ti = proto_tree_add_item(tree, hf_suff, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+        /* hf_suff FIELDTYPE must be FT_UINT_STRING */
+        ti = proto_tree_add_item(tree, hf_suff, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
         offset += len2+1;
 
         if (!(suffix[0] == 'A' || suffix[0] == 'B')) {
@@ -384,7 +387,7 @@ dissect_datarequest(proto_item *ti_arg, gint ett_arg, tvbuff_t *tvb, gint arg_of
                         break;
                 if (tvb_length_remaining(tvb, offset+oidlen+1) <= 0)
                         return offset;
-                proto_tree_add_item(tree, hf_elcom_datarequest_oid, tvb, offset, 1, ENC_ASCII|ENC_NA);
+                proto_tree_add_item(tree, hf_elcom_datarequest_oid, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
                 offset += oidlen+1;
         }
         offset += 1;             /* the loop exited at the 0 length byte */
diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c
index 4ad2f4468f..656a6129a7 100644
--- a/epan/dissectors/packet-gdsdb.c
+++ b/epan/dissectors/packet-gdsdb.c
@@ -442,7 +442,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 							offset, 4, ENC_BIG_ENDIAN);
 		offset += 4;
 		proto_tree_add_item(tree, hf_gdsdb_connect_filename, tvb,
-							offset, 4, ENC_ASCII|ENC_NA);
+							offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
 		length = tvb_get_ntohl(tvb, offset);
 		offset += length + 6;
 		proto_tree_add_item(tree, hf_gdsdb_connect_count, tvb,
@@ -450,7 +450,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		count = tvb_get_ntohl(tvb, offset);
 		offset += 4;
 		proto_tree_add_item(tree, hf_gdsdb_connect_userid, tvb,
-							offset, 4, ENC_ASCII|ENC_NA);
+							offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
 		length = tvb_get_ntohl(tvb, offset);
 		offset += length + 5;
 		for(i=0;i<count;i++){
@@ -538,18 +538,18 @@ gdsdb_attach(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 		return 0;
 	}
 
-    col_append_str(pinfo->cinfo, COL_INFO, ": ");
+	col_append_str(pinfo->cinfo, COL_INFO, ": ");
 	col_append_str(pinfo->cinfo, COL_INFO,
 			tvb_format_text(tvb, 12,
 				tvb_get_ntohl(tvb, 8)));
 
-    if (tree) {
+	if (tree) {
 		offset = 4;
 		proto_tree_add_item(tree, hf_gdsdb_attach_database, tvb,
 							offset, 4, ENC_BIG_ENDIAN);
 		offset += 4;
 		proto_tree_add_item(tree, hf_gdsdb_attach_filename, tvb,
-							offset, 4, ENC_ASCII|ENC_NA);
+							offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
 		length = tvb_get_ntohl(tvb, offset);
 		offset += length + 6;
 		proto_tree_add_uint_format_value(tree,
@@ -574,7 +574,7 @@ gdsdb_compile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 							offset, 4, ENC_BIG_ENDIAN);
 		offset += 4;
 		proto_tree_add_item(tree, hf_gdsdb_compile_blr, tvb,
-							offset, 4, ENC_ASCII|ENC_NA);
+							offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
 	}
 
 	return tvb_length(tvb);
@@ -665,7 +665,7 @@ gdsdb_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 							offset, 8, ENC_BIG_ENDIAN);
 		offset += 8;
 		proto_tree_add_item(tree, hf_gdsdb_response_data, tvb,
-							offset, 4, ENC_ASCII|ENC_NA);
+							offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
 		length = tvb_get_ntohl(tvb, offset);
 		offset += length + 4;
 		proto_tree_add_item(tree, hf_gdsdb_response_status, tvb,
@@ -725,7 +725,7 @@ gdsdb_open_blob2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 	if (tree) {
 		offset = 4;
 		proto_tree_add_item(tree, hf_gdsdb_openblob2_bpb, tvb, offset,
-								4, ENC_ASCII|ENC_NA);
+								4, ENC_ASCII|ENC_BIG_ENDIAN);
 		length = tvb_get_ntohl(tvb, offset);
 		offset += length + 6;
 		proto_tree_add_item(tree, hf_gdsdb_openblob_transaction, tvb,
@@ -829,7 +829,7 @@ gdsdb_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 		offset += 4;
 		if(opcode == op_service_info) {
 			proto_tree_add_item(tree, hf_gdsdb_info_items, tvb,
-							offset, 4, ENC_ASCII|ENC_NA);
+							offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
 			length = tvb_get_ntohl(tvb, offset);
 			offset += length + 6;
 		}
@@ -1024,7 +1024,7 @@ gdsdb_prepare(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 			tvb_format_text(tvb, 20,
 				tvb_get_ntohl(tvb, 16)));
 
-    if(tree) {
+	if(tree) {
 		offset = 4;
 		proto_tree_add_item(tree, hf_gdsdb_prepare_transaction, tvb,
 							offset, 4, ENC_BIG_ENDIAN);
@@ -1036,7 +1036,7 @@ gdsdb_prepare(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 							offset, 4, ENC_BIG_ENDIAN);
 		offset += 4;
 		proto_tree_add_item(tree, hf_gdsdb_prepare_querystr, tvb,
-							offset, 4, ENC_ASCII|ENC_NA);
+							offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
 		length = tvb_get_ntohl(tvb, offset);
 		offset += length + 6;
 		proto_tree_add_uint_format_value(tree,
@@ -1851,3 +1851,16 @@ proto_reg_handoff_gdsdb(void)
 								 proto_gdsdb);
 	dissector_add_uint("tcp.port", TCP_PORT, gdsdb_handle);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index b710df171d..d4bec5173e 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -825,7 +825,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *
                     offset++;
                     len--;
 
-                    proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_group_address, tvb, offset, 16, ENC_BIG_ENDIAN);
+                    proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_group_address, tvb, offset, 16, ENC_NA);
 
                     length -= 16;
                     offset += 16;
@@ -833,7 +833,7 @@ dissect_isis_grp_address_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *
 
 
                     while((len > 0) && (source_num > 0)) {
-                        proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_source_address, tvb, offset, 16, ENC_BIG_ENDIAN);
+                        proto_tree_add_item(rt_tree, hf_isis_lsp_grp_ipv6addr_source_address, tvb, offset, 16, ENC_NA);
 
                         length -= 16;
                         offset += 16;
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index c89ba42bcc..c89962e34c 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -1119,7 +1119,7 @@ static int dissect_jxta_message_framing(tvbuff_t * tvb, packet_info * pinfo, pro
             /*
              *   Put header name into the protocol tree
              */
-            proto_tree_add_item(framing_header_tree, hf_jxta_framing_header_name, tvb, tree_offset, (int)sizeof(gint8), ENC_ASCII|ENC_NA);
+            proto_tree_add_item(framing_header_tree, hf_jxta_framing_header_name, tvb, tree_offset, (int)sizeof(gint8), ENC_ASCII|ENC_BIG_ENDIAN);
 
             /*
              *   Append header name into the header protocol item. It's a nice hint so you don't have to reveal all headers.
@@ -1439,7 +1439,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
             guint16 name_len = tvb_get_ntohs(tvb, tree_offset);
 
             names_table[2 + each_name] = tvb_get_string_enc(wmem_packet_scope(), tvb, tree_offset + (int)sizeof(name_len), name_len, ENC_ASCII);
-            proto_tree_add_item(jxta_msg_tree, hf_jxta_message_names_name, tvb, tree_offset, (int)sizeof(name_len), ENC_ASCII|ENC_NA);
+            proto_tree_add_item(jxta_msg_tree, hf_jxta_message_names_name, tvb, tree_offset, (int)sizeof(name_len), ENC_ASCII|ENC_BIG_ENDIAN);
             tree_offset += (int)sizeof(name_len) + name_len;
         }
 
@@ -1680,13 +1680,13 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p
 
         name_len = tvb_get_ntohs(tvb, tree_offset);
         proto_item_append_text(jxta_elem_tree_item, " \"%s\"", tvb_format_text(tvb, tree_offset + (int)sizeof(guint16), name_len));
-        proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_NA);
+        proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_BIG_ENDIAN);
         tree_offset += (int)sizeof(guint16) + name_len;
 
         /* process type */
         if ((flags & JXTAMSG1_ELMFLAG_TYPE) != 0) {
             guint16 type_len = tvb_get_ntohs(tvb, tree_offset);
-            proto_tree_add_item(jxta_elem_tree, hf_jxta_element_type, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_NA);
+            proto_tree_add_item(jxta_elem_tree, hf_jxta_element_type, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_BIG_ENDIAN);
             tree_offset += (int)sizeof(guint16);
 
             mediatype = tvb_get_string_enc(wmem_packet_scope(), tvb, tree_offset, type_len, ENC_ASCII);
@@ -1697,7 +1697,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p
         /* process encoding */
         if ((flags & JXTAMSG1_ELMFLAG_ENCODING) != 0) {
             guint16 encoding_len = tvb_get_ntohs(tvb, tree_offset);
-            proto_tree_add_item(jxta_elem_tree, hf_jxta_element_encoding, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_NA);
+            proto_tree_add_item(jxta_elem_tree, hf_jxta_element_encoding, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_BIG_ENDIAN);
             tree_offset += (int)sizeof(guint16) + encoding_len;
         }
 
@@ -1955,7 +1955,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p
             /* literal name */
             guint16 name_len = tvb_get_ntohs(tvb, tree_offset);
             proto_item_append_text(jxta_elem_tree_item, " \"%s\"", tvb_format_text(tvb, tree_offset + (int)sizeof(guint16), name_len));
-            proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_NA);
+            proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_BIG_ENDIAN);
             tree_offset += (int)sizeof(guint16) + name_len;
         }
 
@@ -2461,3 +2461,16 @@ void proto_reg_handoff_jxta(void)
             }
     }
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c
index 023578b9fd..8c872a07b3 100644
--- a/epan/dissectors/packet-mpeg-descriptor.c
+++ b/epan/dissectors/packet-mpeg-descriptor.c
@@ -2655,11 +2655,11 @@ proto_mpeg_descriptor_dissect_private_ciplus(tvbuff_t *tvb, guint offset, proto_
         offset += 2;
 
         str_len_byte = tvb_get_guint8(tvb, offset);
-        proto_tree_add_item(descriptor_tree, hf_mpeg_descr_ciplus_svc_prov_name, tvb, offset, 1, ENC_ASCII|ENC_NA);
+        proto_tree_add_item(descriptor_tree, hf_mpeg_descr_ciplus_svc_prov_name, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
         offset += 1+str_len_byte;
 
         str_len_byte = tvb_get_guint8(tvb, offset);
-        proto_tree_add_item(descriptor_tree, hf_mpeg_descr_ciplus_svc_name, tvb, offset, 1, ENC_ASCII|ENC_NA);
+        proto_tree_add_item(descriptor_tree, hf_mpeg_descr_ciplus_svc_name, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
         offset += 1+str_len_byte;
     }
     else if (tag==CIPLUS_DESC_TAG_PROT) {
@@ -4347,7 +4347,6 @@ proto_register_mpeg_descriptor(void)
 
 }
 
-
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c
index 00ab6b685a..0292e5731c 100644
--- a/epan/dissectors/packet-mpeg-dsmcc.c
+++ b/epan/dissectors/packet-mpeg-dsmcc.c
@@ -493,7 +493,7 @@ dissect_dsmcc_dii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         offset +=1;
         if (0 < module_info_len) {
             proto_tree_add_item(mod_tree, hf_etv_module_abs_path, tvb, offset, 1,
-                ENC_ASCII|ENC_NA);
+                ENC_ASCII|ENC_BIG_ENDIAN);
             offset += module_info_len;
         }
     }
@@ -504,7 +504,7 @@ dissect_dsmcc_dii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     if (0 < private_data_len) {
         proto_tree_add_item(tree, hf_etv_dii_authority, tvb, offset, 1,
-            ENC_ASCII|ENC_NA);
+            ENC_ASCII|ENC_BIG_ENDIAN);
         /*offset += private_data_len;*/
     }
 }
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index 549d520a8b..0e9993ab87 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -137,7 +137,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 					return;
 				len = tvb_get_guint8(tvb, 30);
 				proto_tree_add_item(rmp_tree,
-				    hf_rmp_filename, tvb, 30, 1, ENC_ASCII|ENC_NA);
+				    hf_rmp_filename, tvb, 30, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 				if(tvb_offset_exists(tvb, len+31))
 					call_dissector(data_handle,
 					    tvb_new_subset_remaining(tvb, len+31),
@@ -155,7 +155,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				    hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN);
 				len = tvb_get_guint8(tvb, 10);
 				proto_tree_add_item(rmp_tree,
-				    hf_rmp_filename, tvb, 10, 1, ENC_ASCII|ENC_NA);
+				    hf_rmp_filename, tvb, 10, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 				if(tvb_offset_exists(tvb, len+11))
 					call_dissector(data_handle,
 					    tvb_new_subset_remaining(tvb, len+11),
@@ -266,3 +266,16 @@ proto_reg_handoff_rmp(void)
 	dissector_add_uint("hpext.dxsap", HPEXT_DXSAP, rmp_handle);
 	dissector_add_uint("hpext.dxsap", HPEXT_SXSAP, rmp_handle);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 25f2431994..7b280d8111 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -1618,7 +1618,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree
                 item_len = tvb_get_guint8( tvb, offset );
                 /* Item len of 1 because it's an FT_UINT_STRING... */
                 proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_sip_uri,
-                                    tvb, offset, 1, ENC_ASCII|ENC_NA );
+                                    tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN );
                 offset++;
 
                 col_append_fstr(pinfo->cinfo, COL_INFO, " CNAME=\"%s\"",
@@ -1649,7 +1649,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree
                     item_len = tvb_get_guint8( tvb, offset );
                     /* Item len of 1 because it's an FT_UINT_STRING... */
                     proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_disp_name,
-                                        tvb, offset, 1, ENC_ASCII|ENC_NA);
+                                        tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
                     offset++;
 
                     col_append_fstr(pinfo->cinfo, COL_INFO, " DISPLAY-NAME=\"%s\"",
@@ -1727,7 +1727,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree
                 /* Reason phrase */
                 item_len = tvb_get_guint8( tvb, offset );
                 if ( item_len != 0 )
-                    proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason1_phrase, tvb, offset, 1, ENC_ASCII|ENC_NA );
+                    proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason1_phrase, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN );
 
                 offset     += (item_len+1);
                 packet_len -= (item_len+1);
@@ -6523,3 +6523,16 @@ proto_reg_handoff_rtcp(void)
     heur_dissector_add( "udp", dissect_rtcp_heur, proto_rtcp);
         heur_dissector_add("stun", dissect_rtcp_heur, proto_rtcp);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c
index f3eaebd686..1e1e5744da 100644
--- a/epan/dissectors/packet-spdy.c
+++ b/epan/dissectors/packet-spdy.c
@@ -1286,11 +1286,11 @@ static int dissect_spdy_header_payload(
 
       /* Add header name. */
       proto_tree_add_item(header_tree, hf_spdy_header_name, header_tvb,
-                          header_name_offset, 4, ENC_NA);
+                          header_name_offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
 
       /* Add header value. */
       proto_tree_add_item(header_tree, hf_spdy_header_value, header_tvb,
-                          header_value_offset, 4, ENC_NA);
+                          header_value_offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
     }
 
     /*
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 0fd921ab3b..7a613fed76 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -509,7 +509,7 @@ static void ts2_parse_newplayerjoined(tvbuff_t *tvb, proto_tree *ts2_tree)
     offset+=4;
     proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 6, ENC_NA);
     offset+=6;
-    proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_NA);
+    proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 }
 
 /* Parses TS2_LOGINEND packet and adds it to the tree */
@@ -538,7 +538,7 @@ static void ts2_parse_switchchannel(tvbuff_t *tvb, proto_tree *ts2_tree)
     offset=0;
     proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN);
     offset+=4;
-    proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, ENC_ASCII|ENC_NA);
+    proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 }
 
 /* Parses a ts2 channel change (TS2T_CHANNELCHANGE) packet and adds it to the tree */
@@ -587,11 +587,11 @@ static void ts2_parse_loginpart2(tvbuff_t *tvb, proto_tree *ts2_tree)
     offset=0;
     proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 0, 2, ENC_NA);
     offset+=2;
-    proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_ASCII|ENC_NA);
+    proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
     offset+=30;
-    proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_ASCII|ENC_NA);
+    proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
     offset+=30;
-    proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_ASCII|ENC_NA);
+    proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
     offset+=30;
     proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA);
 
@@ -676,7 +676,7 @@ static void ts2_parse_playerlist(tvbuff_t *tvb, proto_tree *ts2_tree)
         proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN);
         ts2_add_statusflags(tvb, ts2_tree, offset);
         offset+=2;
-        proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_NA);
+        proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
         offset+=30;
         x++;
     }
@@ -776,27 +776,27 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                         proto_tree_add_item(ts2_tree, hf_ts2_ackto, tvb, 20, 4, ENC_LITTLE_ENDIAN);
                         break;
                     case TS2T_LOGINREQUEST:
-                        proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, ENC_ASCII|ENC_NA);
-                        proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_NA);
+                        proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, ENC_ASCII|ENC_BIG_ENDIAN);
+                        proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_BIG_ENDIAN);
                         proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA);
                         proto_tree_add_item(ts2_tree, hf_ts2_registeredlogin, tvb, 90, 1, ENC_LITTLE_ENDIAN);
-                        proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, ENC_ASCII|ENC_NA);
-                        proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, ENC_ASCII|ENC_NA);
-                        proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_ASCII|ENC_NA);
+                        proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, ENC_ASCII|ENC_BIG_ENDIAN);
+                        proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, ENC_ASCII|ENC_BIG_ENDIAN);
+                        proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_ASCII|ENC_BIG_ENDIAN);
 
                         conversation_data->server_port=pinfo->destport;
                         conversation_data->server_addr=pinfo->dst;
 
                         break;
                     case TS2T_LOGINREPLY:
-                        proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, ENC_ASCII|ENC_NA);
-                        proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_NA);
+                        proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, ENC_ASCII|ENC_BIG_ENDIAN);
+                        proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_BIG_ENDIAN);
                         proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA);
                         proto_tree_add_item(ts2_tree, hf_ts2_badlogin, tvb, 89, 3, ENC_LITTLE_ENDIAN);
                         proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 92, 80, ENC_NA);
                         proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 172, 4, ENC_LITTLE_ENDIAN);
                         proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 178, 3, ENC_NA);
-                        proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_ASCII|ENC_NA);
+                        proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_ASCII|ENC_BIG_ENDIAN);
                         break;
                 }
                 break;