Various minor changes:

- Create/use some extended value_strings
- Remove unneeded #includes;
- Do whitespace changes;
- Add editor modelines.

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

15 files changed, 461 insertions, 326 deletions

diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index 193bef7fff..393115fe19 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -260,6 +260,7 @@ static const value_string a11_types[] = {
 
     {0, NULL},
 };
+static value_string_ext a11_types_ext = VALUE_STRING_EXT_INIT(a11_types);
 
 static const value_string a11_ses_ptype_vals[] = {
     {0x8881, "Unstructured Byte Stream"},
@@ -312,7 +313,7 @@ static const value_string a11_reply_codes[]= {
     {142, "Registration Denied - nonexistent A10 or IP flow"},
     {0, NULL},
 };
-
+static value_string_ext a11_reply_codes_ext = VALUE_STRING_EXT_INIT(a11_reply_codes);
 
 static const value_string a11_ack_status[]= {
     {0x00, "Update Accepted"},
@@ -328,6 +329,7 @@ static const value_string a11_ack_status[]= {
     {0xff, "Update Denied - handoff in progress"},
     {0, NULL},
 };
+static value_string_ext a11_ack_status_ext = VALUE_STRING_EXT_INIT(a11_ack_status);
 
 typedef enum {
     MH_AUTH_EXT      = 32,
@@ -357,11 +359,12 @@ static const value_string a11_ext_types[]= {
     {RU_AUTH_EXT,      "Registration Update Authentication Extension"},
     {MN_NAI_EXT,       "Mobile Node NAI Extension"},
     {MF_CHALLENGE_EXT, "MN-FA Challenge Extension"},
-    {NVSE_EXT,         "Normal Vendor/Organization Specific Extension"},
     {OLD_NVSE_EXT,     "Normal Vendor/Organization Specific Extension (OLD)"},
+    {NVSE_EXT,         "Normal Vendor/Organization Specific Extension"},
     {BCMCS_EXT,        "BCMCS Session Extension"},
     {0, NULL},
 };
+static value_string_ext a11_ext_types_ext = VALUE_STRING_EXT_INIT(a11_ext_types);
 
 static const value_string a11_ext_stypes[]= {
     {1, "MN AAA Extension"},
@@ -462,6 +465,7 @@ static const value_string a11_ext_app[]= {
     {0xB001, "System Identifiers (BSID / HRPD Subnet)"},
     {0, NULL},
 };
+static value_string_ext a11_ext_app_ext = VALUE_STRING_EXT_INIT(a11_ext_app);
 
 #if 0
 static const value_string a11_airlink_types[]= {
@@ -497,7 +501,6 @@ static const value_string a11_rohc_profile_vals[] =
     { 0x0003,    "ROHC ESP" },                   /*RFC 3095*/
     { 0x0004,    "ROHC IP" },                    /*RFC 3843*/
     { 0x0005,    "ROHC LLA" },                   /*RFC 3242*/
-    { 0x0105,    "ROHC LLA with R-mode" },       /*RFC 3408*/
     { 0x0006,    "ROHC TCP" },                   /*RFC 4996*/
     { 0x0007,    "ROHC RTP/UDP-Lite" },          /*RFC 4019*/
     { 0x0008,    "ROHC UDP-Lite" },              /*RFC 4019*/
@@ -505,10 +508,12 @@ static const value_string a11_rohc_profile_vals[] =
     { 0x0102,    "ROHCv2 UDP" },                 /*RFC 5225*/
     { 0x0103,    "ROHCv2 ESP" },                 /*RFC 5225*/
     { 0x0104,    "ROHCv2 IP" },                  /*RFC 5225*/
+    { 0x0105,    "ROHC LLA with R-mode" },       /*RFC 3408*/
     { 0x0107,    "ROHCv2 RTP/UDP-Lite" },        /*RFC 5225*/
     { 0x0108,    "ROHCv2 UDP-Lite" },            /*RFC 5225*/
     { 0, NULL },
 };
+static value_string_ext a11_rohc_profile_vals_ext = VALUE_STRING_EXT_INIT(a11_rohc_profile_vals);
 
 #define NUM_ATTR (sizeof(attrs)/sizeof(struct radius_attribute))
 
@@ -1331,7 +1336,7 @@ dissect_a11_extensions( tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tre
 
         ext_tree = proto_tree_add_subtree_format(exts_tree, tvb, offset, ext_len + hdrLen,
                                  ett_a11_ext, NULL, "Extension: %s",
-                                 val_to_str(ext_type, a11_ext_types,
+                                 val_to_str_ext(ext_type, &a11_ext_types_ext,
                                             "Unknown Extension %u"));
 
         proto_tree_add_uint(ext_tree, hf_a11_ext_type, tvb, offset, 1, ext_type);
@@ -1551,7 +1556,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
         return 0;       /* not enough data to check message type */
 
     type = tvb_get_guint8(tvb, offset);
-    if (try_val_to_str(type, a11_types) == NULL)
+    if (try_val_to_str_ext(type, &a11_types_ext) == NULL)
         return 0;       /* not a known message type */
 
     /* Make entries in Protocol column and Info column on summary display */
@@ -2072,7 +2077,7 @@ proto_register_a11(void)
     static hf_register_info hf[] = {
         { &hf_a11_type,
           { "Message Type",           "a11.type",
-            FT_UINT8, BASE_DEC, VALS(a11_types), 0,
+            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_types_ext, 0,
             "A11 Message Type", HFILL }
         },
         { &hf_a11_flags,
@@ -2117,12 +2122,12 @@ proto_register_a11(void)
         },
         { &hf_a11_code,
           { "Reply Code",           "a11.code",
-            FT_UINT8, BASE_DEC, VALS(a11_reply_codes), 0,
+            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_reply_codes_ext, 0,
             "A11 Registration Reply code", HFILL }
         },
         { &hf_a11_status,
           { "Reply Status",           "a11.ackstat",
-            FT_UINT8, BASE_DEC, VALS(a11_ack_status), 0,
+            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_ack_status_ext, 0,
             "A11 Registration Ack Status", HFILL }
         },
         { &hf_a11_life,
@@ -2153,7 +2158,7 @@ proto_register_a11(void)
         },
         { &hf_a11_ext_type,
           { "Extension Type",           "a11.ext.type",
-            FT_UINT8, BASE_DEC, VALS(a11_ext_types), 0,
+            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_ext_types_ext, 0,
             "Mobile IP Extension Type", HFILL }
         },
         { &hf_a11_ext_stype,
@@ -2228,7 +2233,7 @@ proto_register_a11(void)
         },
         { &hf_a11_vse_apptype,
           { "Application Type",                      "a11.ext.apptype",
-            FT_UINT8, BASE_HEX, VALS(a11_ext_app), 0,
+            FT_UINT8, BASE_HEX | BASE_EXT_STRING, &a11_ext_app_ext, 0,
             NULL, HFILL }
         },
         { &hf_a11_vse_ppaddr,
@@ -2263,7 +2268,7 @@ proto_register_a11(void)
         },
         { &hf_a11_vse_code,
           { "Reply Code",           "a11.ext.code",
-            FT_UINT8, BASE_DEC, VALS(a11_reply_codes), 0,
+            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_reply_codes_ext, 0,
             NULL, HFILL }
         },
         /* XXX: Is this the correct filter name ?? */
@@ -2596,7 +2601,7 @@ proto_register_a11(void)
 
         { &hf_a11_ase_forward_profile,
           { "Forward Profile",   "a11.ext.ase.forwardprofile",
-            FT_UINT16, BASE_DEC, VALS(a11_rohc_profile_vals), 0,
+            FT_UINT16, BASE_DEC | BASE_EXT_STRING, &a11_rohc_profile_vals_ext, 0,
             NULL, HFILL }
         },
 
@@ -2633,7 +2638,7 @@ proto_register_a11(void)
 
         { &hf_a11_ase_reverse_profile,
           { "Reverse Profile",   "a11.ext.ase.reverseprofile",
-            FT_UINT16, BASE_DEC, VALS(a11_rohc_profile_vals), 0,
+            FT_UINT16, BASE_DEC | BASE_EXT_STRING, &a11_rohc_profile_vals_ext, 0,
             NULL, HFILL }
         },
         { &hf_a11_aut_flow_prof_sub_type,
@@ -2753,3 +2758,16 @@ proto_reg_handoff_a11(void)
     /* 3GPP2-Authorized-Flow-Profile-IDs(131) */
     radius_register_avp_dissector(VENDOR_THE3GPP2, 131, dissect_3gpp2_radius_aut_flow_profile_ids);
 }
+
+/*
+ * 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-artnet.c b/epan/dissectors/packet-artnet.c
index 938e45e9ef..7a5a392414 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -31,7 +31,7 @@
 /*
  * See
  *
- *	http://www.artisticlicence.com/WebSiteMaster/User%20Guides/art-net.pdf
+ *     http://www.artisticlicence.com/WebSiteMaster/User%20Guides/art-net.pdf
  */
 
 void proto_register_artnet(void);
@@ -143,6 +143,7 @@ static const value_string artnet_opcode_vals[] = {
   { ARTNET_OP_IP_PROG_REPLY,      "ArtIpProgReply" },
   { 0,                            NULL }
 };
+static value_string_ext artnet_opcode_vals_ext = VALUE_STRING_EXT_INIT(artnet_opcode_vals);
 
 static const value_string artnet_oem_code_vals[] = {
   { 0x0000, "Artistic Licence:DMX-Hub:4x DMX in,4x DMX out" },
@@ -1919,15 +1920,15 @@ dissect_artnet_tod_request(tvbuff_t *tvb, guint offset, proto_tree *tree)
   guint8 ad_count;
 
   proto_tree_add_item(tree, hf_artnet_filler, tvb,
-		      offset, 2, ENC_NA);
+                      offset, 2, ENC_NA);
   offset += 2;
 
   proto_tree_add_item(tree, hf_artnet_spare, tvb,
-		      offset, 8, ENC_NA);
+                      offset, 8, ENC_NA);
   offset += 8;
 
   proto_tree_add_item(tree, hf_artnet_tod_request_command, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   ad_count = tvb_get_guint8(tvb, offset);
@@ -1936,7 +1937,7 @@ dissect_artnet_tod_request(tvbuff_t *tvb, guint offset, proto_tree *tree)
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_tod_request_address, tvb,
-		      offset, ad_count, ENC_NA);
+                      offset, ad_count, ENC_NA);
   offset += ad_count;
 
   return offset;
@@ -1948,31 +1949,31 @@ dissect_artnet_tod_data(tvbuff_t *tvb, guint offset, proto_tree *tree)
   guint8 i, uid_count;
 
   proto_tree_add_item(tree, hf_artnet_filler, tvb,
-		      offset, 1, ENC_NA);
+                      offset, 1, ENC_NA);
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_tod_data_port, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_spare, tvb,
-		      offset, 8, ENC_NA);
+                      offset, 8, ENC_NA);
   offset += 8;
 
   proto_tree_add_item(tree, hf_artnet_tod_data_command_response, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_tod_data_address, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_tod_data_uid_total, tvb,
-		      offset, 2, ENC_BIG_ENDIAN);
+                      offset, 2, ENC_BIG_ENDIAN);
   offset += 2;
 
   proto_tree_add_item(tree, hf_artnet_tod_data_block_count, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   uid_count = tvb_get_guint8(tvb, offset);
@@ -1994,19 +1995,19 @@ static guint
 dissect_artnet_tod_control(tvbuff_t *tvb, guint offset, proto_tree *tree)
 {
   proto_tree_add_item(tree, hf_artnet_filler, tvb,
-		      offset, 2, ENC_NA);
+                      offset, 2, ENC_NA);
   offset += 2;
 
   proto_tree_add_item(tree, hf_artnet_spare, tvb,
-		      offset, 8, ENC_NA);
+                      offset, 8, ENC_NA);
   offset += 8;
 
   proto_tree_add_item(tree, hf_artnet_tod_control_command, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_tod_control_address, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   return offset;
@@ -2024,11 +2025,11 @@ dissect_artnet_rdm(tvbuff_t *tvb, guint offset, proto_tree *tree,  packet_info *
   rdmver = tvb_get_guint8(tvb, offset);
   if (rdmver == 0x00) {
     proto_tree_add_item(tree, hf_artnet_filler, tvb,
-		        offset, 2, ENC_NA);
+                        offset, 2, ENC_NA);
     offset += 2;
 
     proto_tree_add_item(tree, hf_artnet_spare, tvb,
-		        offset, 8, ENC_NA);
+                        offset, 8, ENC_NA);
     offset += 8;
   } else {
     proto_tree_add_item(tree, hf_artnet_rdm_rdmver, tvb,
@@ -2049,11 +2050,11 @@ dissect_artnet_rdm(tvbuff_t *tvb, guint offset, proto_tree *tree,  packet_info *
   }
 
   proto_tree_add_item(tree, hf_artnet_rdm_command, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_rdm_address, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
   offset += 1;
 
   /* check for old version that included the 0xCC startcode
@@ -2063,7 +2064,7 @@ dissect_artnet_rdm(tvbuff_t *tvb, guint offset, proto_tree *tree,  packet_info *
 
   if (sc == 0xCC) {
     proto_tree_add_item(tree, hf_artnet_rdm_sc, tvb,
-		      offset, 1, ENC_BIG_ENDIAN);
+                      offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
   }
 
@@ -2151,11 +2152,11 @@ dissect_artnet_ip_prog(tvbuff_t *tvb, guint offset, proto_tree *tree) {
   proto_tree *flags_tree, *flags_item;
 
   proto_tree_add_item(tree, hf_artnet_filler, tvb,
-		      offset, 2, ENC_NA);
+                      offset, 2, ENC_NA);
   offset += 2;
 
   flags_item = proto_tree_add_item(tree, hf_artnet_ip_prog_command, tvb,
-	                           offset, 1, ENC_BIG_ENDIAN);
+                                   offset, 1, ENC_BIG_ENDIAN);
 
   flags_tree = proto_item_add_subtree(flags_item, ett_artnet);
   proto_tree_add_item(flags_tree, hf_artnet_ip_prog_command_prog_port,   tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -2168,23 +2169,23 @@ dissect_artnet_ip_prog(tvbuff_t *tvb, guint offset, proto_tree *tree) {
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_filler, tvb,
-		      offset, 1, ENC_NA);
+                      offset, 1, ENC_NA);
   offset += 1;
 
   proto_tree_add_item(tree, hf_artnet_ip_prog_ip, tvb,
-		      offset, 4, ENC_BIG_ENDIAN);
+                      offset, 4, ENC_BIG_ENDIAN);
   offset += 4;
 
   proto_tree_add_item(tree, hf_artnet_ip_prog_sm, tvb,
-		      offset, 4, ENC_BIG_ENDIAN);
+                      offset, 4, ENC_BIG_ENDIAN);
   offset += 4;
 
   proto_tree_add_item(tree, hf_artnet_ip_prog_port, tvb,
-		      offset, 2, ENC_BIG_ENDIAN);
+                      offset, 2, ENC_BIG_ENDIAN);
   offset += 2;
 
   proto_tree_add_item(tree, hf_artnet_spare, tvb,
-		      offset, 8, ENC_NA);
+                      offset, 8, ENC_NA);
   offset += 8;
 
   return offset;
@@ -2202,15 +2203,15 @@ dissect_artnet_ip_prog_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
   offset += 4;
 
   proto_tree_add_item(tree, hf_artnet_ip_prog_reply_sm, tvb,
-		      offset, 4, ENC_BIG_ENDIAN);
+                      offset, 4, ENC_BIG_ENDIAN);
   offset += 4;
 
   proto_tree_add_item(tree, hf_artnet_ip_prog_reply_port, tvb,
-		      offset, 2, ENC_BIG_ENDIAN);
+                      offset, 2, ENC_BIG_ENDIAN);
   offset += 2;
 
   proto_tree_add_item(tree, hf_artnet_spare, tvb,
-		      offset, 8, ENC_NA);
+                      offset, 8, ENC_NA);
   offset += 8;
 
   return offset;
@@ -2241,10 +2242,10 @@ dissect_artnet_diag_data(tvbuff_t *tvb, guint offset, proto_tree *tree)
                       offset, 2, ENC_NA);
   offset += 2;
 
-	length = tvb_get_ntohs(tvb, offset);
-	proto_tree_add_item(tree, hf_artnet_diag_data_length, tvb,
-											offset, 2, ENC_NA);
-	offset+=2;
+  length = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_item(tree, hf_artnet_diag_data_length, tvb,
+                      offset, 2, ENC_NA);
+  offset+=2;
 
   proto_tree_add_item(tree, hf_artnet_diag_data_data, tvb,
                       offset, length, ENC_ASCII|ENC_NA);
@@ -2465,13 +2466,13 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   opcode = tvb_get_letohs(tvb, offset);
 
   col_add_fstr(pinfo->cinfo, COL_INFO, "%s (0x%04x)",
-    val_to_str_const(opcode, artnet_opcode_vals, "Unknown"), opcode);
+    val_to_str_ext_const(opcode, &artnet_opcode_vals_ext, "Unknown"), opcode);
 
   if (tree) {
     proto_tree_add_uint(artnet_header_tree, hf_artnet_header_opcode, tvb,
                         offset, 2, opcode);
 
-    proto_item_append_text(ti, ", Opcode: %s (0x%04x)", val_to_str_const(opcode, artnet_opcode_vals, "Unknown"), opcode);
+    proto_item_append_text(ti, ", Opcode: %s (0x%04x)", val_to_str_ext_const(opcode, &artnet_opcode_vals_ext, "Unknown"), opcode);
   }
   offset += 2;
 
@@ -3193,7 +3194,7 @@ proto_register_artnet(void) {
     { &hf_artnet_header_opcode,
       { "Opcode",
         "artnet.header.opcode",
-        FT_UINT16, BASE_HEX, VALS(artnet_opcode_vals), 0x0,
+        FT_UINT16, BASE_HEX | BASE_EXT_STRING, &artnet_opcode_vals_ext, 0x0,
         "Art-Net message type", HFILL }},
 
     { &hf_artnet_header_protver,
@@ -4336,3 +4337,16 @@ proto_reg_handoff_artnet(void) {
 
   heur_dissector_add("udp", dissect_artnet_heur, proto_artnet);
 }
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 0fb89a9c72..1dbf6ab773 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -67,7 +67,7 @@ static heur_dissector_list_t heur_epl_data_subdissector_list;
 #if 0
 /* Container for tapping relevant data */
 typedef struct _epl_info_t {
-    unsigned char epl_mtyp;
+	unsigned char epl_mtyp;
 } epl_info_t;
 #endif
 
@@ -79,21 +79,21 @@ typedef struct _epl_info_t {
 #define EPL_BROADCAST_NODEID                    255
 
 static const value_string addr_str_vals[] = {
-    {EPL_INVALID_NODEID,                    " (invalid)"                        },
-    {EPL_MN_NODEID,                         " (Managing Node)"                  },
-    {EPL_DIAGNOSTIC_DEVICE_NODEID,          " (Diagnostic Device)"              },
-    {EPL_TO_LEGACY_ETHERNET_ROUTER_NODEID,  " (EPL to legacy Ethernet Router)"  },
-    {EPL_BROADCAST_NODEID,                  " (broadcast)"                      },
-    {0,NULL}
+	{EPL_INVALID_NODEID,                    " (invalid)"                        },
+	{EPL_MN_NODEID,                         " (Managing Node)"                  },
+	{EPL_DIAGNOSTIC_DEVICE_NODEID,          " (Diagnostic Device)"              },
+	{EPL_TO_LEGACY_ETHERNET_ROUTER_NODEID,  " (EPL to legacy Ethernet Router)"  },
+	{EPL_BROADCAST_NODEID,                  " (broadcast)"                      },
+	{0,NULL}
 };
 
 static const value_string addr_str_abbr_vals[] _U_ = {
-    {EPL_INVALID_NODEID,                    " (inv.)"   },
-    {EPL_MN_NODEID,                         " (MN)"     },
-    {EPL_DIAGNOSTIC_DEVICE_NODEID,          " (diag.)"  },
-    {EPL_TO_LEGACY_ETHERNET_ROUTER_NODEID,  " (router)" },
-    {EPL_BROADCAST_NODEID,                  " (bc)"     },
-    {0,NULL}
+	{EPL_INVALID_NODEID,                    " (inv.)"   },
+	{EPL_MN_NODEID,                         " (MN)"     },
+	{EPL_DIAGNOSTIC_DEVICE_NODEID,          " (diag.)"  },
+	{EPL_TO_LEGACY_ETHERNET_ROUTER_NODEID,  " (router)" },
+	{EPL_BROADCAST_NODEID,                  " (bc)"     },
+	{0,NULL}
 };
 /*
 static const gchar* addr_str_abbr_cn  = " (CN)";
@@ -132,13 +132,13 @@ static const gchar* addr_str_abbr_res = " (res.)";
 #define EPL_AINV    0x0D
 
 static const value_string mtyp_vals[] = {
-    {EPL_SOC,  "Start of Cycle (SoC)"         },
-    {EPL_PREQ, "PollRequest (PReq)"           },
-    {EPL_PRES, "PollResponse (PRes)"          },
-    {EPL_SOA,  "Start of Asynchronous (SoA)"  },
-    {EPL_ASND, "Asynchronous Send (ASnd)"     },
-    {EPL_AINV, "Asynchronous Invite (AInv)"   },
-    {0,NULL}
+	{EPL_SOC,  "Start of Cycle (SoC)"         },
+	{EPL_PREQ, "PollRequest (PReq)"           },
+	{EPL_PRES, "PollResponse (PRes)"          },
+	{EPL_SOA,  "Start of Asynchronous (SoA)"  },
+	{EPL_ASND, "Asynchronous Send (ASnd)"     },
+	{EPL_AINV, "Asynchronous Invite (AInv)"   },
+	{0,NULL}
 };
 
 #define EPL_SOC_MC_MASK              0x80
@@ -154,13 +154,13 @@ static const value_string mtyp_vals[] = {
 #define EPL_SOA_UNSPECIFIEDINVITE     255
 
 static const value_string soa_svid_vals[] = {
-    {EPL_SOA_NOSERVICE,           "NoService"        },
-    {EPL_SOA_IDENTREQUEST,        "IdentRequest"     },
-    {EPL_SOA_STATUSREQUEST,       "StatusRequest"    },
-    {EPL_SOA_NMTREQUESTINVITE,    "NMTRequestInvite" },
-    {EPL_SOA_SYNCREQUEST,         "SyncRequest"      },
-    {EPL_SOA_UNSPECIFIEDINVITE,   "UnspecifiedInvite"},
-    {0,NULL}
+	{EPL_SOA_NOSERVICE,           "NoService"        },
+	{EPL_SOA_IDENTREQUEST,        "IdentRequest"     },
+	{EPL_SOA_STATUSREQUEST,       "StatusRequest"    },
+	{EPL_SOA_NMTREQUESTINVITE,    "NMTRequestInvite" },
+	{EPL_SOA_SYNCREQUEST,         "SyncRequest"      },
+	{EPL_SOA_UNSPECIFIEDINVITE,   "UnspecifiedInvite"},
+	{0,NULL}
 };
 
 /* ServiceID values for EPL message type "ASnd" */
@@ -172,13 +172,13 @@ static const value_string soa_svid_vals[] = {
 #define EPL_ASND_SYNCRESPONSE           6
 
 static const value_string asnd_svid_vals[] = {
-    {EPL_ASND_IDENTRESPONSE,  "IdentResponse" },
-    {EPL_ASND_STATUSRESPONSE, "StatusResponse"},
-    {EPL_ASND_NMTREQUEST,     "NMTRequest"    },
-    {EPL_ASND_NMTCOMMAND,     "NMTCommand"    },
-    {EPL_ASND_SDO,            "SDO"           },
-    {EPL_ASND_SYNCRESPONSE,   "SyncResponse"  },
-    {0,NULL}
+	{EPL_ASND_IDENTRESPONSE,  "IdentResponse" },
+	{EPL_ASND_STATUSRESPONSE, "StatusResponse"},
+	{EPL_ASND_NMTREQUEST,     "NMTRequest"    },
+	{EPL_ASND_NMTCOMMAND,     "NMTCommand"    },
+	{EPL_ASND_SDO,            "SDO"           },
+	{EPL_ASND_SYNCRESPONSE,   "SyncResponse"  },
+	{0,NULL}
 };
 
 /* NMTCommand values for EPL message type "ASnd" */
@@ -214,39 +214,39 @@ static const value_string asnd_svid_vals[] = {
 #define EPL_ASND_NMTCOMMAND_NMTINVALIDSERVICE           0xFF
 
 static const value_string asnd_cid_vals[] = {
-    /* "special" values to cover all possibilities of CommandID in NMTRequests */
-    {EPL_ASND_IDENTRESPONSE,                          "IdentResponse"             },
-    {EPL_ASND_STATUSRESPONSE,                         "StatusResponse"            },
-    /* ... */
-    {EPL_ASND_NMTCOMMAND_NMTSTARTNODE,                "NMTStartNode"              },
-    {EPL_ASND_NMTCOMMAND_NMTSTOPNODE,                 "NMTStopNode"               },
-    {EPL_ASND_NMTCOMMAND_NMTENTERPREOPERATIONAL2,     "NMTEnterPreOperational2"   },
-    {EPL_ASND_NMTCOMMAND_NMTENABLEREADYTOOPERATE,     "NMTEnableReadyToOperate"   },
-    {EPL_ASND_NMTCOMMAND_NMTRESETNODE,                "NMTResetNode"              },
-    {EPL_ASND_NMTCOMMAND_NMTRESETCOMMUNICATION,       "NMTResetCommunication"     },
-    {EPL_ASND_NMTCOMMAND_NMTRESETCONFIGURATION,       "NMTResetConfiguration"     },
-    {EPL_ASND_NMTCOMMAND_NMTSWRESET,                  "NMTSwReset"                },
-    {EPL_ASND_NMTCOMMAND_NMTSTARTNODEEX,              "NMTStartNodeEx"            },
-    {EPL_ASND_NMTCOMMAND_NMTSTOPNODEEX,               "NMTStopNodeEx"             },
-    {EPL_ASND_NMTCOMMAND_NMTENTERPREOPERATIONAL2EX,   "NMTEnterPreOperational2Ex" },
-    {EPL_ASND_NMTCOMMAND_NMTENABLEREADYTOOPERATEEX,   "NMTEnableReadyToOperateEx" },
-    {EPL_ASND_NMTCOMMAND_NMTRESETNODEEX,              "NMTResetNodeEx"            },
-    {EPL_ASND_NMTCOMMAND_NMTRESETCOMMUNICATIONEX,     "NMTCommunicationEx"        },
-    {EPL_ASND_NMTCOMMAND_NMTRESETCONFIGURATIONEX,     "NMTResetConfigurationEx"   },
-    {EPL_ASND_NMTCOMMAND_NMTSWRESETEX,                "NMTSwResetEx"              },
-    {EPL_ASND_NMTCOMMAND_NMTNETHOSTNAMESET,           "NMTNetHostNameSet"         },
-    {EPL_ASND_NMTCOMMAND_NMTFLUSHARPENTRY,            "NMTFlushArpEntry"          },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHCONFIGUREDNODES,   "NMTPublishConfiguredNodes" },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHACTIVENODES,       "NMTPublishActiveNodes"     },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHPREOPERATIONAL1,   "NMTPublishPreOperational1" },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHPREOPERATIONAL2,   "NMTPublishPreOperational2" },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHREADYTOOPERATE,    "NMTPublishReadyToOperate"  },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHOPERATIONAL,       "NMTPublishOperational"     },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHSTOPPED,           "NMTPublishStopped"         },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHEMERGENCYNEW,      "NMTPublishEmergencyNew"    },
-    {EPL_ASND_NMTCOMMAND_NMTPUBLISHTIME,              "NMTPublishTime"            },
-    {EPL_ASND_NMTCOMMAND_NMTINVALIDSERVICE,           "NMTInvalidService"         },
-    {0,NULL}
+	/* "special" values to cover all possibilities of CommandID in NMTRequests */
+	{EPL_ASND_IDENTRESPONSE,                          "IdentResponse"             },
+	{EPL_ASND_STATUSRESPONSE,                         "StatusResponse"            },
+	/* ... */
+	{EPL_ASND_NMTCOMMAND_NMTSTARTNODE,                "NMTStartNode"              },
+	{EPL_ASND_NMTCOMMAND_NMTSTOPNODE,                 "NMTStopNode"               },
+	{EPL_ASND_NMTCOMMAND_NMTENTERPREOPERATIONAL2,     "NMTEnterPreOperational2"   },
+	{EPL_ASND_NMTCOMMAND_NMTENABLEREADYTOOPERATE,     "NMTEnableReadyToOperate"   },
+	{EPL_ASND_NMTCOMMAND_NMTRESETNODE,                "NMTResetNode"              },
+	{EPL_ASND_NMTCOMMAND_NMTRESETCOMMUNICATION,       "NMTResetCommunication"     },
+	{EPL_ASND_NMTCOMMAND_NMTRESETCONFIGURATION,       "NMTResetConfiguration"     },
+	{EPL_ASND_NMTCOMMAND_NMTSWRESET,                  "NMTSwReset"                },
+	{EPL_ASND_NMTCOMMAND_NMTSTARTNODEEX,              "NMTStartNodeEx"            },
+	{EPL_ASND_NMTCOMMAND_NMTSTOPNODEEX,               "NMTStopNodeEx"             },
+	{EPL_ASND_NMTCOMMAND_NMTENTERPREOPERATIONAL2EX,   "NMTEnterPreOperational2Ex" },
+	{EPL_ASND_NMTCOMMAND_NMTENABLEREADYTOOPERATEEX,   "NMTEnableReadyToOperateEx" },
+	{EPL_ASND_NMTCOMMAND_NMTRESETNODEEX,              "NMTResetNodeEx"            },
+	{EPL_ASND_NMTCOMMAND_NMTRESETCOMMUNICATIONEX,     "NMTCommunicationEx"        },
+	{EPL_ASND_NMTCOMMAND_NMTRESETCONFIGURATIONEX,     "NMTResetConfigurationEx"   },
+	{EPL_ASND_NMTCOMMAND_NMTSWRESETEX,                "NMTSwResetEx"              },
+	{EPL_ASND_NMTCOMMAND_NMTNETHOSTNAMESET,           "NMTNetHostNameSet"         },
+	{EPL_ASND_NMTCOMMAND_NMTFLUSHARPENTRY,            "NMTFlushArpEntry"          },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHCONFIGUREDNODES,   "NMTPublishConfiguredNodes" },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHACTIVENODES,       "NMTPublishActiveNodes"     },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHPREOPERATIONAL1,   "NMTPublishPreOperational1" },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHPREOPERATIONAL2,   "NMTPublishPreOperational2" },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHREADYTOOPERATE,    "NMTPublishReadyToOperate"  },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHOPERATIONAL,       "NMTPublishOperational"     },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHSTOPPED,           "NMTPublishStopped"         },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHEMERGENCYNEW,      "NMTPublishEmergencyNew"    },
+	{EPL_ASND_NMTCOMMAND_NMTPUBLISHTIME,              "NMTPublishTime"            },
+	{EPL_ASND_NMTCOMMAND_NMTINVALIDSERVICE,           "NMTInvalidService"         },
+	{0,NULL}
 };
 static value_string_ext asnd_cid_vals_ext = VALUE_STRING_EXT_INIT(asnd_cid_vals);
 
@@ -294,15 +294,15 @@ static epl_sdo_reassembly epl_asnd_sdo_reassembly_read;
 #define EPL_PR_NMTREQUEST       0x07
 
 static const value_string epl_pr_vals[] = {
-    {0,                       "lowest"},
-    {1,                       "lower"},
-    {2,                       "below generic"},
-    {EPL_PR_GENERICREQUEST,   "GenericRequest"},
-    {4,                       "above generic"},
-    {5,                       "higher"},
-    {6,                       "below NMTRequest"},
-    {EPL_PR_NMTREQUEST,       "NMTRequest"},
-    {0,NULL}
+	{0,                       "lowest"},
+	{1,                       "lower"},
+	{2,                       "below generic"},
+	{EPL_PR_GENERICREQUEST,   "GenericRequest"},
+	{4,                       "above generic"},
+	{5,                       "higher"},
+	{6,                       "below NMTRequest"},
+	{EPL_PR_NMTREQUEST,       "NMTRequest"},
+	{0,NULL}
 };
 
 /* NMT State values (for CN)*/
@@ -319,18 +319,18 @@ static const value_string epl_pr_vals[] = {
 #define EPL_NMT_CS_BASIC_ETHERNET       0x1E
 
 static const value_string epl_nmt_cs_vals[] = {
-    {EPL_NMT_GS_OFF,                  "NMT_GS_OFF"                },
-    {EPL_NMT_GS_INITIALIZING,         "NMT_GS_INITIALIZING"       },
-    {EPL_NMT_GS_RESET_APPLICATION,    "NMT_GS_RESET_APPLICATION"  },
-    {EPL_NMT_GS_RESET_COMMUNICATION,  "NMT_GS_RESET_COMMUNICATION"},
-    {EPL_NMT_CS_NOT_ACTIVE,           "NMT_CS_NOT_ACTIVE"         },
-    {EPL_NMT_CS_PRE_OPERATIONAL_1,    "NMT_CS_PRE_OPERATIONAL_1"  },
-    {EPL_NMT_CS_PRE_OPERATIONAL_2,    "NMT_CS_PRE_OPERATIONAL_2"  },
-    {EPL_NMT_CS_READY_TO_OPERATE,     "NMT_CS_READY_TO_OPERATE"   },
-    {EPL_NMT_CS_OPERATIONAL,          "NMT_CS_OPERATIONAL"        },
-    {EPL_NMT_CS_STOPPED,              "NMT_CS_STOPPED"            },
-    {EPL_NMT_CS_BASIC_ETHERNET,       "NMT_CS_BASIC_ETHERNET"     },
-    {0,NULL}
+	{EPL_NMT_GS_OFF,                  "NMT_GS_OFF"                },
+	{EPL_NMT_GS_INITIALIZING,         "NMT_GS_INITIALIZING"       },
+	{EPL_NMT_GS_RESET_APPLICATION,    "NMT_GS_RESET_APPLICATION"  },
+	{EPL_NMT_GS_RESET_COMMUNICATION,  "NMT_GS_RESET_COMMUNICATION"},
+	{EPL_NMT_CS_NOT_ACTIVE,           "NMT_CS_NOT_ACTIVE"         },
+	{EPL_NMT_CS_PRE_OPERATIONAL_1,    "NMT_CS_PRE_OPERATIONAL_1"  },
+	{EPL_NMT_CS_PRE_OPERATIONAL_2,    "NMT_CS_PRE_OPERATIONAL_2"  },
+	{EPL_NMT_CS_READY_TO_OPERATE,     "NMT_CS_READY_TO_OPERATE"   },
+	{EPL_NMT_CS_OPERATIONAL,          "NMT_CS_OPERATIONAL"        },
+	{EPL_NMT_CS_STOPPED,              "NMT_CS_STOPPED"            },
+	{EPL_NMT_CS_BASIC_ETHERNET,       "NMT_CS_BASIC_ETHERNET"     },
+	{0,NULL}
 };
 
 /* NMT State values (for MN)*/
@@ -1500,13 +1500,13 @@ dissect_eplpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean udp
 static int
 dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    return dissect_eplpdu(tvb, pinfo, tree, FALSE);
+	return dissect_eplpdu(tvb, pinfo, tree, FALSE);
 }
 
 static int
 dissect_epludp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    return dissect_eplpdu(tvb, pinfo, tree, TRUE);
+	return dissect_eplpdu(tvb, pinfo, tree, TRUE);
 }
 
 
@@ -2671,7 +2671,7 @@ dissect_epl_sdo_command_write_by_index(proto_tree *epl_tree, tvbuff_t *tvb, pack
 			}
 			/* add the frame to reassembly_table */
 			frag_msg = fragment_add_seq_check(&epl_reassembly_table, tvb, offset, pinfo,
-                                               fragmentId, NULL, ct, payload_length, end_segment ? FALSE : TRUE );
+							  fragmentId, NULL, ct, payload_length, end_segment ? FALSE : TRUE );
 
 			/* if the reassembly_table is not Null and the frame stored is the same as the current frame */
 			if(frag_msg != NULL && (epl_asnd_sdo_reassembly_write.frame[epl_segmentation.recv][epl_segmentation.send] == frame))
@@ -2685,7 +2685,7 @@ dissect_epl_sdo_command_write_by_index(proto_tree *epl_tree, tvbuff_t *tvb, pack
 					/* add the reassembley fields */
 					process_reassembled_data(tvb, 0, pinfo, "Reassembled Message", frag_msg, &epl_frag_items, NULL, payload_tree );
 					proto_tree_add_uint_format_value(payload_tree, hf_epl_asnd_sdo_cmd_reassembled, tvb, 0, 0,
-                                                                payload_length, "%d bytes (over all fragments)", frag_msg->len);
+									 payload_length, "%d bytes (over all fragments)", frag_msg->len);
 					col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)" );
 					/* reset memory */
 					memset(&epl_asnd_sdo_reassembly_write,0,sizeof(epl_sdo_reassembly));
@@ -3006,7 +3006,7 @@ dissect_epl_sdo_command_read_by_index(proto_tree *epl_tree, tvbuff_t *tvb, packe
 			}
 			/* add the frame to reassembly_table */
 			frag_msg = fragment_add_seq_check(&epl_reassembly_table, tvb, offset, pinfo,
-                                               fragmentId, NULL, count, payload_length, end_segment ? FALSE : TRUE );
+							  fragmentId, NULL, count, payload_length, end_segment ? FALSE : TRUE );
 
 			/* if the reassembly_table is not Null and the frame stored is the same as the current frame */
 			if(frag_msg != NULL && (epl_asnd_sdo_reassembly_read.frame[epl_segmentation.recv][epl_segmentation.send] == frame))
@@ -3019,7 +3019,7 @@ dissect_epl_sdo_command_read_by_index(proto_tree *epl_tree, tvbuff_t *tvb, packe
 					/* add the reassembley fields */
 					process_reassembled_data(tvb, 0, pinfo, "Reassembled Message", frag_msg, &epl_frag_items, NULL, payload_tree );
 					proto_tree_add_uint_format_value(payload_tree, hf_epl_asnd_sdo_cmd_reassembled, tvb, 0, 0,
-                                                                payload_length, "%d bytes (over all fragments)", frag_msg->len);
+									 payload_length, "%d bytes (over all fragments)", frag_msg->len);
 					col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)" );
 					/* reset memory */
 					memset(&epl_asnd_sdo_reassembly_read,0,sizeof(epl_sdo_reassembly));
diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h
index 7f5db63db4..bb31373513 100644
--- a/epan/dissectors/packet-gsm_a_common.h
+++ b/epan/dissectors/packet-gsm_a_common.h
@@ -931,24 +931,24 @@ typedef enum
     BE_UDEF_130,                        /* Undefined */
     BE_KC128,                           /* Kc128 */
     BE_CSG_ID,                          /* CSG Identifier */
-	BE_REDIR_ATT_FLG,                   /* Redirect Attempt Flag               3.2.2.111    */
-	BE_REROUTE_REJ_CAUSE,               /* Reroute Reject Cause                3.2.2.112    */
-	BE_SEND_SEQN,                       /* Send Sequence Number                3.2.2.113    */
-	BE_REROUTE_OUTCOME,                 /* Reroute complete outcome            3.2.2.114    */
-	BE_GLOBAL_CALL_REF,                 /* Global Call Reference               3.2.2.115    */
-	BE_LCLS_CONF,                       /* LCLS-Configuration                  3.2.2.116    */
-	BE_LCLS_CON_STATUS_CONTROL,         /* LCLS-Connection-Status-Control      3.2.2.117    */
-	BE_LCLS_CORR_NOT_NEEDED,            /* LCLS-Correlation-Not-Needed         3.2.2.118    */
-	BE_LCLS_BSS_STATUS,                 /* LCLS-BSS-Status                     3.2.2.119    */
-	BE_LCLS_BREAK_REQ,                  /* LCLS-Break-Request                  3.2.2.120    */
-	BE_CSFB_IND,                        /* CSFB Indication                     3.2.2.121    */
+    BE_REDIR_ATT_FLG,                   /* Redirect Attempt Flag               3.2.2.111    */
+    BE_REROUTE_REJ_CAUSE,               /* Reroute Reject Cause                3.2.2.112    */
+    BE_SEND_SEQN,                       /* Send Sequence Number                3.2.2.113    */
+    BE_REROUTE_OUTCOME,                 /* Reroute complete outcome            3.2.2.114    */
+    BE_GLOBAL_CALL_REF,                 /* Global Call Reference               3.2.2.115    */
+    BE_LCLS_CONF,                       /* LCLS-Configuration                  3.2.2.116    */
+    BE_LCLS_CON_STATUS_CONTROL,         /* LCLS-Connection-Status-Control      3.2.2.117    */
+    BE_LCLS_CORR_NOT_NEEDED,            /* LCLS-Correlation-Not-Needed         3.2.2.118    */
+    BE_LCLS_BSS_STATUS,                 /* LCLS-BSS-Status                     3.2.2.119    */
+    BE_LCLS_BREAK_REQ,                  /* LCLS-Break-Request                  3.2.2.120    */
+    BE_CSFB_IND,                        /* CSFB Indication                     3.2.2.121    */
 #if 0
-	BE_CS_TO_PS_SRVCC,                  /* CS to PS SRVCC                      3.2.2.122    */
-	BE_SRC_ENB_2_TGT_ENB_TRANSP_INF,    /* Source eNB to target eNB transparent information (E-UTRAN)" 3.2.2.123    */
-	BE_CS_TO_PS_SRVCC_IND,              /* CS to PS SRVCC Indication           3.2.2.124    */
-	BE_CN_TO_MS_TRANSP,                 /* CN to MS transparent information    3.2.2.125    */
+    BE_CS_TO_PS_SRVCC,                  /* CS to PS SRVCC                      3.2.2.122    */
+    BE_SRC_ENB_2_TGT_ENB_TRANSP_INF,    /* Source eNB to target eNB transparent information (E-UTRAN)" 3.2.2.123    */
+    BE_CS_TO_PS_SRVCC_IND,              /* CS to PS SRVCC Indication           3.2.2.124    */
+    BE_CN_TO_MS_TRANSP,                 /* CN to MS transparent information    3.2.2.125    */
 #endif
-	BE_SELECTED_PLMN_ID,                /* Selected PLMN ID                    3.2.2.126    */
+    BE_SELECTED_PLMN_ID,                /* Selected PLMN ID                    3.2.2.126    */
     BE_NONE                             /* NONE */
 }
 bssmap_elem_idx_t;
@@ -1440,3 +1440,16 @@ typedef enum
 sgsap_elem_idx_t;
 
 #endif /* __PACKET_GSM_A_COMMON_H__ */
+
+/*
+ * 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-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index deb8481a5c..0057c0c531 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -110,13 +110,15 @@ const value_string gsm_a_dtap_msg_gmm_strings[] = {
 	{ 0x12,	"Authentication and Ciphering Req" },
 	{ 0x13,	"Authentication and Ciphering Resp" },
 	{ 0x14,	"Authentication and Ciphering Rej" },
-	{ 0x1c,	"Authentication and Ciphering Failure" },
 	{ 0x15,	"Identity Request" },
 	{ 0x16,	"Identity Response" },
+	{ 0x1c,	"Authentication and Ciphering Failure" },
 	{ 0x20,	"GMM Status" },
 	{ 0x21,	"GMM Information" },
 	{ 0, NULL }
 };
+static value_string_ext gsm_a_dtap_msg_gmm_strings_ext = VALUE_STRING_EXT_INIT(gsm_a_dtap_msg_gmm_strings);
+
 
 const value_string gsm_a_dtap_msg_sm_strings[] = {
 	{ 0x41,	"Activate PDP Context Request" },
@@ -150,75 +152,77 @@ const value_string gsm_a_dtap_msg_sm_strings[] = {
 	{ 0x5d,	"Notification" },
 	{ 0, NULL }
 };
+static value_string_ext gsm_a_dtap_msg_sm_strings_ext = VALUE_STRING_EXT_INIT(gsm_a_dtap_msg_sm_strings);
+
 
 static const value_string gsm_gm_elem_strings[] = {
 	/* GPRS Mobility Management Information Elements 10.5.5 */
-	{ DE_ADD_UPD_TYPE,	"Additional Update Type" },
-	{ DE_ATTACH_RES,	"Attach Result" },
-	{ DE_ATTACH_TYPE,	"Attach Type" },
-	{ DE_CIPH_ALG,	"Cipher Algorithm" },
-	{ DE_TMSI_STAT,	"TMSI Status" },
-	{ DE_DETACH_TYPE,	"Detach Type" },
-	{ DE_DRX_PARAM,	"DRX Parameter" },
-	{ DE_FORCE_TO_STAND,	"Force to Standby" },
-	{ DE_FORCE_TO_STAND_H, "Force to Standby" },
-	{ DE_P_TMSI_SIG,	"P-TMSI Signature" },
-	{ DE_P_TMSI_SIG_2,	"P-TMSI Signature 2" },
-	{ DE_ID_TYPE_2,	"Identity Type 2" },
-	{ DE_IMEISV_REQ,	"IMEISV Request" },
-	{ DE_REC_N_PDU_NUM_LIST,	"Receive N-PDU Numbers List" },
-	{ DE_MS_NET_CAP,	"MS Network Capability" },
-	{ DE_MS_RAD_ACC_CAP,	"MS Radio Access Capability" },
-	{ DE_GMM_CAUSE,	"GMM Cause" },
-	{ DE_RAI,	"Routing Area Identification" },
-	{ DE_RAI_2,	"Routing Area Identification 2" },
-	{ DE_UPD_RES,	"Update Result" },
-	{ DE_UPD_TYPE, "Update Type" },
-	{ DE_AC_REF_NUM,	"A&C Reference Number" },
-	{ DE_AC_REF_NUM_H, "A&C Reference Number" },
-	{ DE_SRVC_TYPE,	"Service Type" },
-	{ DE_CELL_NOT,	"Cell Notification" },
-	{ DE_PS_LCS_CAP, "PS LCS Capability" },
-	{ DE_NET_FEAT_SUP,	"Network Feature Support" },
-	{ DE_ADD_NET_FEAT_SUP,	"Additional Network Feature Support" },
-	{ DE_RAT_INFO_CONTAINER, "Inter RAT information container" },
-	{ DE_REQ_MS_INFO, "Requested MS information" },
-	{ DE_UE_NETWORK_CAP, "UE network capability" },
+	{ DE_ADD_UPD_TYPE,		 "Additional Update Type" },
+	{ DE_ATTACH_RES,		 "Attach Result" },
+	{ DE_ATTACH_TYPE,		 "Attach Type" },
+	{ DE_CIPH_ALG,			 "Cipher Algorithm" },
+	{ DE_TMSI_STAT,			 "TMSI Status" },
+	{ DE_DETACH_TYPE,		 "Detach Type" },
+	{ DE_DRX_PARAM,			 "DRX Parameter" },
+	{ DE_FORCE_TO_STAND,		 "Force to Standby" },
+	{ DE_FORCE_TO_STAND_H,		 "Force to Standby" },
+	{ DE_P_TMSI_SIG,		 "P-TMSI Signature" },
+	{ DE_P_TMSI_SIG_2,		 "P-TMSI Signature 2" },
+	{ DE_ID_TYPE_2,			 "Identity Type 2" },
+	{ DE_IMEISV_REQ,		 "IMEISV Request" },
+	{ DE_REC_N_PDU_NUM_LIST,	 "Receive N-PDU Numbers List" },
+	{ DE_MS_NET_CAP,		 "MS Network Capability" },
+	{ DE_MS_RAD_ACC_CAP,		 "MS Radio Access Capability" },
+	{ DE_GMM_CAUSE,			 "GMM Cause" },
+	{ DE_RAI,			 "Routing Area Identification" },
+	{ DE_RAI_2,			 "Routing Area Identification 2" },
+	{ DE_UPD_RES,			 "Update Result" },
+	{ DE_UPD_TYPE,			 "Update Type" },
+	{ DE_AC_REF_NUM,		 "A&C Reference Number" },
+	{ DE_AC_REF_NUM_H,		 "A&C Reference Number" },
+	{ DE_SRVC_TYPE,			 "Service Type" },
+	{ DE_CELL_NOT,			 "Cell Notification" },
+	{ DE_PS_LCS_CAP,		 "PS LCS Capability" },
+	{ DE_NET_FEAT_SUP,		 "Network Feature Support" },
+	{ DE_ADD_NET_FEAT_SUP,		 "Additional Network Feature Support" },
+	{ DE_RAT_INFO_CONTAINER,	 "Inter RAT information container" },
+	{ DE_REQ_MS_INFO,		 "Requested MS information" },
+	{ DE_UE_NETWORK_CAP,		 "UE network capability" },
 	{ DE_EUTRAN_IRAT_INFO_CONTAINER, "E-UTRAN inter RAT information container" },
-	{ DE_VOICE_DOMAIN_PREF, "Voice domain preference and UE's usage setting" },
-	{ DE_PTMSI_TYPE, "P-TMSI type" },
-	{ DE_LAI_2, "Location Area Identification 2" },
-	{ DE_NET_RES_ID_CONT, "Network resource identifier container" },
+	{ DE_VOICE_DOMAIN_PREF,		 "Voice domain preference and UE's usage setting" },
+	{ DE_PTMSI_TYPE,		 "P-TMSI type" },
+	{ DE_LAI_2,			 "Location Area Identification 2" },
+	{ DE_NET_RES_ID_CONT,		 "Network resource identifier container" },
 	/* Session Management Information Elements 10.5.6 */
-	{ DE_ACC_POINT_NAME,	"Access Point Name" },
-	{ DE_NET_SAPI,	"Network Service Access Point Identifier" },
-	{ DE_PRO_CONF_OPT,	"Protocol Configuration Options" },
-	{ DE_PD_PRO_ADDR,	"Packet Data Protocol Address" },
-	{ DE_QOS,	"Quality Of Service" },
-	{ DE_SM_CAUSE,	"SM Cause" },
-	{ DE_SM_CAUSE_2, "SM Cause 2" },
-	{ DE_LINKED_TI,	"Linked TI" },
-	{ DE_LLC_SAPI,	"LLC Service Access Point Identifier" },
-	{ DE_TEAR_DOWN_IND,	"Tear Down Indicator" },
-	{ DE_PACKET_FLOW_ID,	"Packet Flow Identifier" },
-	{ DE_TRAFFIC_FLOW_TEMPLATE,	"Traffic Flow Template" },
-	{ DE_TMGI, "Temporary Mobile Group Identity (TMGI)" },
-	{ DE_MBMS_BEARER_CAP, "MBMS bearer capabilities" },
-	{ DE_MBMS_PROT_CONF_OPT, "MBMS protocol configuration options" },
-	{ DE_ENH_NSAPI, "Enhanced network service access point identifier" },
-	{ DE_REQ_TYPE, "Request type" },
-	{ DE_SM_NOTIF_IND, "Notification indicator" },
-	{ DE_SM_CONNECTIVITY_TYPE, "Connectivity type" },
+	{ DE_ACC_POINT_NAME,		 "Access Point Name" },
+	{ DE_NET_SAPI,			 "Network Service Access Point Identifier" },
+	{ DE_PRO_CONF_OPT,		 "Protocol Configuration Options" },
+	{ DE_PD_PRO_ADDR,		 "Packet Data Protocol Address" },
+	{ DE_QOS,			 "Quality Of Service" },
+	{ DE_SM_CAUSE,			 "SM Cause" },
+	{ DE_SM_CAUSE_2,		 "SM Cause 2" },
+	{ DE_LINKED_TI,			 "Linked TI" },
+	{ DE_LLC_SAPI,			 "LLC Service Access Point Identifier" },
+	{ DE_TEAR_DOWN_IND,		 "Tear Down Indicator" },
+	{ DE_PACKET_FLOW_ID,		 "Packet Flow Identifier" },
+	{ DE_TRAFFIC_FLOW_TEMPLATE,	 "Traffic Flow Template" },
+	{ DE_TMGI,			 "Temporary Mobile Group Identity (TMGI)" },
+	{ DE_MBMS_BEARER_CAP,		 "MBMS bearer capabilities" },
+	{ DE_MBMS_PROT_CONF_OPT,	 "MBMS protocol configuration options" },
+	{ DE_ENH_NSAPI,			 "Enhanced network service access point identifier" },
+	{ DE_REQ_TYPE,			 "Request type" },
+	{ DE_SM_NOTIF_IND,		 "Notification indicator" },
+	{ DE_SM_CONNECTIVITY_TYPE,	 "Connectivity type" },
 	/* GPRS Common Information Elements 10.5.7 */
-	{ DE_PDP_CONTEXT_STAT,	"PDP Context Status" },
-	{ DE_RAD_PRIO,	"Radio Priority" },
-	{ DE_GPRS_TIMER,	"GPRS Timer" },
-	{ DE_GPRS_TIMER_2,	"GPRS Timer 2" },
-	{ DE_GPRS_TIMER_3,	"GPRS Timer 3" },
-	{ DE_RAD_PRIO_2, "Radio Priority 2"},
-	{ DE_MBMS_CTX_STATUS,	"MBMS context status"},
-	{ DE_UPLINK_DATA_STATUS,	"Uplink data status"},
-	{ DE_DEVICE_PROPERTIES,	"Device properties"},
+	{ DE_PDP_CONTEXT_STAT,		 "PDP Context Status" },
+	{ DE_RAD_PRIO,			 "Radio Priority" },
+	{ DE_GPRS_TIMER,		 "GPRS Timer" },
+	{ DE_GPRS_TIMER_2,		 "GPRS Timer 2" },
+	{ DE_GPRS_TIMER_3,		 "GPRS Timer 3" },
+	{ DE_RAD_PRIO_2,		 "Radio Priority 2"},
+	{ DE_MBMS_CTX_STATUS,		 "MBMS context status"},
+	{ DE_UPLINK_DATA_STATUS,	 "Uplink data status"},
+	{ DE_DEVICE_PROPERTIES,		 "Device properties"},
 	{ 0, NULL }
 };
 value_string_ext gsm_gm_elem_strings_ext = VALUE_STRING_EXT_INIT(gsm_gm_elem_strings);
@@ -7074,7 +7078,7 @@ get_gmm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf_idx
 {
 	gint idx;
 
-	*msg_str      = try_val_to_str_idx((guint32) (oct & DTAP_GMM_IEI_MASK), gsm_a_dtap_msg_gmm_strings, &idx);
+	*msg_str      = try_val_to_str_idx_ext((guint32) (oct & DTAP_GMM_IEI_MASK), &gsm_a_dtap_msg_gmm_strings_ext, &idx);
 	*hf_idx	      = hf_gsm_a_dtap_msg_gmm_type;
 	if (*msg_str != NULL) {
 		*ett_tree     = ett_gsm_dtap_msg_gmm[idx];
@@ -7089,7 +7093,7 @@ get_sm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf_idx,
 {
 	gint idx;
 
-	*msg_str      = try_val_to_str_idx((guint32) (oct & DTAP_SM_IEI_MASK), gsm_a_dtap_msg_sm_strings, &idx);
+	*msg_str      = try_val_to_str_idx_ext((guint32) (oct & DTAP_SM_IEI_MASK), &gsm_a_dtap_msg_sm_strings_ext, &idx);
 	*hf_idx	      = hf_gsm_a_dtap_msg_sm_type;
 	if (*msg_str != NULL) {
 		*ett_tree     = ett_gsm_dtap_msg_sm[idx];
@@ -7111,12 +7115,12 @@ proto_register_gsm_a_gm(void)
 	static hf_register_info hf[] = {
 		{ &hf_gsm_a_dtap_msg_gmm_type,
 		  { "DTAP GPRS Mobility Management Message Type",	"gsm_a.dtap.msg_gmm_type",
-		    FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_gmm_strings), 0x0,
+		    FT_UINT8, BASE_HEX | BASE_EXT_STRING, &gsm_a_dtap_msg_gmm_strings_ext, 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_dtap_msg_sm_type,
 		  { "DTAP GPRS Session Management Message Type",	"gsm_a.dtap.msg_sm_type",
-		    FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_sm_strings), 0x0,
+		    FT_UINT8, BASE_HEX | BASE_EXT_STRING, &gsm_a_dtap_msg_sm_strings_ext, 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_elem_id,
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index 33e4a81907..97cdd36939 100644
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -1203,12 +1203,12 @@ proto_reg_handoff_igmp(void)
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
+ * c-basic-offset: 8
  * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=8 noexpandtab:
- * :indentSize=4:tabSize=8:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */
 
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 31c713aec1..7a6632ea68 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -176,8 +176,8 @@ static gboolean global_megaco_raw_text = TRUE;
 static gboolean global_megaco_dissect_tree = TRUE;
 
 /* Some basic utility functions that are specific to this dissector */
-static gint megaco_tvb_skip_wsp(tvbuff_t* tvb, gint offset);
-static gint megaco_tvb_skip_wsp_return(tvbuff_t* tvb, gint offset);
+static gint megaco_tvb_skip_wsp(tvbuff_t *tvb, gint offset);
+static gint megaco_tvb_skip_wsp_return(tvbuff_t *tvb, gint offset);
 /*
 * The various functions that either dissect some
 * subpart of MEGACO.  These aren't really proto dissectors but they
@@ -223,7 +223,7 @@ tvb_raw_text_add(tvbuff_t *tvb, proto_tree *tree);
 static void
 dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 static gint
-megaco_tvb_find_token(tvbuff_t* tvb, gint offset, gint maxlength);
+megaco_tvb_find_token(tvbuff_t *tvb, gint offset, gint maxlength);
 static dissector_handle_t data_handle;
 static dissector_handle_t sdp_handle;
 static dissector_handle_t h245_handle;
@@ -335,17 +335,17 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guchar      needle;
     guint8      first;
 
-    gcp_msg_t* msg = NULL;
-    gcp_trx_t* trx = NULL;
-    gcp_ctx_t* ctx = NULL;
-    gcp_cmd_t* cmd = NULL;
-    gcp_term_t* term = NULL;
-    gcp_trx_type_t trx_type = GCP_TRX_NONE;
-    guint32 trx_id = 0;
-    guint32 ctx_id = 0;
-    gcp_cmd_type_t cmd_type = GCP_CMD_NONE;
-    gcp_wildcard_t wild_term = GCP_WILDCARD_NONE;
-    proto_item *hidden_item;
+    gcp_msg_t      *msg       = NULL;
+    gcp_trx_t      *trx       = NULL;
+    gcp_ctx_t      *ctx       = NULL;
+    gcp_cmd_t      *cmd       = NULL;
+    gcp_term_t     *term      = NULL;
+    gcp_trx_type_t  trx_type  = GCP_TRX_NONE;
+    guint32         trx_id    = 0;
+    guint32         ctx_id    = 0;
+    gcp_cmd_type_t  cmd_type  = GCP_CMD_NONE;
+    gcp_wildcard_t  wild_term = GCP_WILDCARD_NONE;
+    proto_item     *hidden_item;
 
     top_tree=tree;
     /* Initialize variables */
@@ -882,10 +882,10 @@ nextcontext:
                 tvb_next_offset = tvb_command_start_offset + tokenlen;
 
                 /* Try to dissect Topology Descriptor before the command */
-				tempchar = tvb_get_guint8(tvb, tvb_command_start_offset);
-				if ( (tempchar >= 'a')&& (tempchar <= 'z')){
+                tempchar = tvb_get_guint8(tvb, tvb_command_start_offset);
+                if ( (tempchar >= 'a')&& (tempchar <= 'z')){
                     tempchar = tempchar - 0x20;
-				}
+                }
                 if ( tempchar == 'T') {
                     tempchar = tvb_get_guint8(tvb, tvb_command_start_offset+1);
 
@@ -959,7 +959,7 @@ nextcontext:
 
                 if ( tempchar != 'E' ){
 
-					/* Short form used */
+                    /* Short form used */
                     if ( tvb_get_guint8(tvb, 0 ) == '!'){
 
                         switch ( tempchar ){
@@ -1138,17 +1138,17 @@ nextcontext:
                             break;
 
                         default:
-							{
-								proto_item *item;
-
-								tokenlen =  (tvb_RBRKT+1) - tvb_previous_offset;
-								tvb_ensure_bytes_exist(tvb, tvb_previous_offset, tokenlen);
-								item = proto_tree_add_string(megaco_tree, hf_megaco_error_Frame, tvb,
-									tvb_previous_offset, tokenlen,
-									"No Command detectable !");
-								proto_item_append_text(item,"[ tempchar 0x%x ]", tempchar);
-								return;
-							}
+                        {
+                            proto_item *item;
+
+                            tokenlen =  (tvb_RBRKT+1) - tvb_previous_offset;
+                            tvb_ensure_bytes_exist(tvb, tvb_previous_offset, tokenlen);
+                            item = proto_tree_add_string(megaco_tree, hf_megaco_error_Frame, tvb,
+                                                         tvb_previous_offset, tokenlen,
+                                                         "No Command detectable !");
+                            proto_item_append_text(item,"[ tempchar 0x%x ]", tempchar);
+                            return;
+                        }
                         }
                     }
                     else{
@@ -3631,3 +3631,15 @@ proto_reg_handoff_megaco(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-mux27010.c b/epan/dissectors/packet-mux27010.c
index 9c717e9128..71240fad60 100644
--- a/epan/dissectors/packet-mux27010.c
+++ b/epan/dissectors/packet-mux27010.c
@@ -1432,3 +1432,15 @@ proto_reg_handoff_mux27010(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-nfs.c b/epan/dissectors/packet-nfs.c
index 27f662f0a4..20664108ce 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -7561,11 +7561,11 @@ dissect_nfs4_cb_client4(tvbuff_t *tvb, int offset, proto_tree *tree)
 	cbprog = tvb_get_ntohl(tvb, offset);
 	reg_callback(cbprog);
 	offset = dissect_rpc_uint32(tvb, tree, hf_nfs4_cb_program, offset);
-    old_offset = offset;
+	old_offset = offset;
 	cb_location = proto_tree_add_subtree(tree, tvb, offset, 0, ett_nfs4_clientaddr, &fitem, "cb_location");
 
 	offset = dissect_nfs4_clientaddr(tvb, offset, cb_location);
-    proto_item_set_len(fitem, offset - old_offset);
+	proto_item_set_len(fitem, offset - old_offset);
 
 	return offset;
 }
@@ -7801,7 +7801,7 @@ dissect_nfs4_change_info(tvbuff_t *tvb, int offset,
 	offset = dissect_rpc_bool(  tvb, newftree, hf_nfs4_change_info_atomic, offset);
 	offset = dissect_rpc_uint64(tvb, newftree, hf_nfs4_changeid_before,    offset);
 	offset = dissect_rpc_uint64(tvb, newftree, hf_nfs4_changeid_after,     offset);
-    proto_item_set_len(fitem, offset - old_offset);
+	proto_item_set_len(fitem, offset - old_offset);
 
 	return offset;
 }
@@ -7888,7 +7888,7 @@ dissect_nfs4_stateid(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 *hash)
 	if (hash)
 		*hash = sid_hash;
 
-    proto_item_set_len(fitem, offset - old_offset);
+	proto_item_set_len(fitem, offset - old_offset);
 
 	return offset;
 }
@@ -12459,12 +12459,12 @@ proto_register_nfs(void)
 		&ett_nfs4_want_notify_flags
 	};
 
-  	static ei_register_info ei[] = {
-  	  	{ &ei_nfs_too_many_ops, { "nfs.too_many_ops", PI_PROTOCOL, PI_NOTE, "Too many operations", EXPFILL }},
-  	  	{ &ei_nfs_not_vnx_file, { "nfs.not_vnx_file", PI_UNDECODED, PI_WARN, "Not a Celerra|VNX file handle", EXPFILL }},
-  	};
+	static ei_register_info ei[] = {
+		{ &ei_nfs_too_many_ops, { "nfs.too_many_ops", PI_PROTOCOL, PI_NOTE, "Too many operations", EXPFILL }},
+		{ &ei_nfs_not_vnx_file, { "nfs.not_vnx_file", PI_UNDECODED, PI_WARN, "Not a Celerra|VNX file handle", EXPFILL }},
+	};
 
-  	module_t *nfs_module;
+	module_t *nfs_module;
 	expert_module_t* expert_nfs;
 
 	proto_nfs = proto_register_protocol("Network File System", "NFS", "nfs");
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c
index 3efccb168a..155366b98c 100644
--- a/epan/dissectors/packet-opensafety.c
+++ b/epan/dissectors/packet-opensafety.c
@@ -55,7 +55,6 @@
 #include <wsutil/crc8.h>
 #include <wsutil/crc16.h>
 
-#include <stdio.h>
 #include <string.h>
 
 
@@ -361,6 +360,7 @@ static const value_string sod_idx_names[] = {
 
     { 0, NULL }
 };
+static value_string_ext sod_idx_names_ext = VALUE_STRING_EXT_INIT(sod_idx_names);
 
 static const value_string abort_codes[] = {
 
@@ -405,6 +405,7 @@ static const value_string abort_codes[] = {
 
     { 0, NULL }
 };
+static value_string_ext abort_codes_ext = VALUE_STRING_EXT_INIT(abort_codes);
 
 static const true_false_string opensafety_message_direction = { "Request", "Response" };
 #define OPENSAFETY_REQUEST  TRUE
@@ -1068,15 +1069,15 @@ static void dissect_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_tvb, proto_
 
             item = proto_tree_add_uint_format_value(ssdo_payload, hf_oss_ssdo_sod_index, new_tvb,
                                                     0, 0,  0x1018, "0x%04X (%s)", 0x1018,
-                                                    val_to_str_const( ((guint32) (0x1018 << 16) ),
-                                                                      sod_idx_names, "Unknown") );
+                                                    val_to_str_ext_const( ((guint32) (0x1018 << 16) ),
+                                                                          &sod_idx_names_ext, "Unknown") );
             sod_tree = proto_item_add_subtree(item, ett_opensafety_ssdo_sodentry);
             PROTO_ITEM_SET_GENERATED(item);
 
             item = proto_tree_add_uint_format_value(sod_tree, hf_oss_ssdo_sod_subindex, new_tvb, 0, 0,
-                                                             0x06, "0x%02X (%s)", 0x06,
-                                                             val_to_str_const(((guint32) (0x1018 << 16) +  0x06),
-                                                                                            sod_idx_names, "Unknown") );
+                                                    0x06, "0x%02X (%s)", 0x06,
+                                                    val_to_str_ext_const(((guint32) (0x1018 << 16) +  0x06),
+                                                                         &sod_idx_names_ext, "Unknown") );
             PROTO_ITEM_SET_GENERATED(item);
 
             entry = tvb_get_letohl ( new_tvb, 0 );
@@ -1114,8 +1115,8 @@ static void dissect_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_tvb, proto_
 
                 item = proto_tree_add_uint_format_value(ssdo_payload, hf_oss_ssdo_sod_index, new_tvb,
                                                         ctr, 2,  ssdoIndex, "0x%04X (%s)", ssdoIndex,
-                                                        val_to_str_const( ((guint32) (dispSSDOIndex << 16) ),
-                                                                          sod_idx_names, "Unknown") );
+                                                        val_to_str_ext_const( ((guint32) (dispSSDOIndex << 16) ),
+                                                                              &sod_idx_names_ext, "Unknown") );
                 if ( ssdoIndex != dispSSDOIndex )
                     PROTO_ITEM_SET_GENERATED ( item );
 
@@ -1127,9 +1128,9 @@ static void dissect_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_tvb, proto_
                 if ( ssdoSubIndex != 0 )
                 {
                     proto_tree_add_uint_format_value(sod_tree, hf_oss_ssdo_sod_subindex, new_tvb, ctr + 2, 1,
-                                                 ssdoSubIndex, "0x%02X (%s)", ssdoSubIndex,
-                                                 val_to_str_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex),
-                                                                                sod_idx_names, "Unknown") );
+                                                     ssdoSubIndex, "0x%02X (%s)", ssdoSubIndex,
+                                                     val_to_str_ext_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex),
+                                                                          &sod_idx_names_ext, "Unknown") );
                 }
                 else
                     proto_tree_add_uint_format_value(sod_tree, hf_oss_ssdo_sod_subindex, new_tvb, ctr + 2, 1,
@@ -1349,17 +1350,17 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto
 
         proto_tree_add_uint_format_value(ssdo_tree, hf_oss_ssdo_sod_index, message_tvb, db0Offset + 1, 2,
                 ssdoIndex, "0x%04X (%s)", ssdoIndex,
-                val_to_str_const(((guint32) (ssdoIndex << 16)), sod_idx_names, "Unknown") );
-        col_append_fstr(pinfo->cinfo, COL_INFO, " [%s", val_to_str_const(((guint32) (ssdoIndex << 16)), sod_idx_names, "Unknown"));
+                val_to_str_ext_const(((guint32) (ssdoIndex << 16)), &sod_idx_names_ext, "Unknown") );
+        col_append_fstr(pinfo->cinfo, COL_INFO, " [%s", val_to_str_ext_const(((guint32) (ssdoIndex << 16)), &sod_idx_names_ext, "Unknown"));
 
         /* Some SOD downloads (0x101A for instance) don't have sub-indeces */
         if ( ssdoSubIndex != 0x0 )
         {
             proto_tree_add_uint_format_value(ssdo_tree, hf_oss_ssdo_sod_subindex, message_tvb, db0Offset + 3, 1,
                 ssdoSubIndex, "0x%02X (%s)", ssdoSubIndex,
-                val_to_str_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), sod_idx_names, "Unknown") );
+                val_to_str_ext_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), &sod_idx_names_ext, "Unknown") );
             col_append_fstr(pinfo->cinfo, COL_INFO, " - %s",
-                    val_to_str_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), sod_idx_names, "Unknown"));
+                    val_to_str_ext_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), &sod_idx_names_ext, "Unknown"));
         }
         col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "]" );
         payloadOffset += 3;
@@ -1371,8 +1372,8 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto
 
         proto_tree_add_uint_format_value(ssdo_tree, hf_oss_ssdo_abort_code, message_tvb, frameStart1 + OSS_FRAME_POS_DATA + 4, 4, abortcode,
                 "0x%04X %04X - %s", (guint16)(abortcode >> 16), (guint16)(abortcode),
-                val_to_str_const(abortcode, abort_codes, "Unknown"));
-        col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", val_to_str_const(abortcode, abort_codes, "Unknown"));
+                val_to_str_ext_const(abortcode, &abort_codes_ext, "Unknown"));
+        col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", val_to_str_ext_const(abortcode, &abort_codes_ext, "Unknown"));
 
 
     } else {
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
index 3cc3f9f1da..2de91eab57 100644
--- a/epan/dissectors/packet-rdm.c
+++ b/epan/dissectors/packet-rdm.c
@@ -2780,3 +2780,15 @@ proto_register_rdm(void)
 	register_dissector("rdm", dissect_rdm, proto_rdm);
 }
 
+/*
+ * 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-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index b86fb12e26..c6d6c44ff9 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -4814,3 +4814,16 @@ proto_reg_handoff_zbee_zcl_appl_ctrl(void)
                             (zbee_zcl_fn_cmd_id)dissect_zcl_appl_ctrl_cmd_id
                          );
 } /*proto_reg_handoff_zbee_zcl_appl_ctrl*/
+
+/*
+ * 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/gcp.c b/epan/gcp.c
index 7689469659..4f5287f3c1 100644
--- a/epan/gcp.c
+++ b/epan/gcp.c
@@ -39,35 +39,35 @@ static wmem_tree_t* ctxs_by_trx = NULL;
 static wmem_tree_t* ctxs = NULL;
 
 const value_string gcp_cmd_type[] = {
-    { GCP_CMD_NONE, "NoCommand"},
-    { GCP_CMD_ADD_REQ, "addReq"},
-    { GCP_CMD_MOVE_REQ, "moveReq"},
-    { GCP_CMD_MOD_REQ, "modReq"},
-    { GCP_CMD_SUB_REQ, "subtractReq"},
-    { GCP_CMD_AUDITCAP_REQ, "auditCapRequest"},
-    { GCP_CMD_AUDITVAL_REQ, "auditValueRequest"},
-    { GCP_CMD_NOTIFY_REQ, "notifyReq"},
-    { GCP_CMD_SVCCHG_REQ, "serviceChangeReq"},
-    { GCP_CMD_TOPOLOGY_REQ, "topologyReq"},
+    { GCP_CMD_NONE,               "NoCommand"},
+    { GCP_CMD_ADD_REQ,            "addReq"},
+    { GCP_CMD_MOVE_REQ,           "moveReq"},
+    { GCP_CMD_MOD_REQ,            "modReq"},
+    { GCP_CMD_SUB_REQ,            "subtractReq"},
+    { GCP_CMD_AUDITCAP_REQ,       "auditCapRequest"},
+    { GCP_CMD_AUDITVAL_REQ,       "auditValueRequest"},
+    { GCP_CMD_NOTIFY_REQ,         "notifyReq"},
+    { GCP_CMD_SVCCHG_REQ,         "serviceChangeReq"},
+    { GCP_CMD_TOPOLOGY_REQ,       "topologyReq"},
     { GCP_CMD_CTX_ATTR_AUDIT_REQ, "ctxAttrAuditReq"},
-    { GCP_CMD_ADD_REPLY, "addReply"},
-    { GCP_CMD_MOVE_REPLY, "moveReply"},
-    { GCP_CMD_MOD_REPLY, "modReply"},
-    { GCP_CMD_SUB_REPLY, "subtractReply"},
-    { GCP_CMD_AUDITCAP_REPLY, "auditCapReply"},
-    { GCP_CMD_AUDITVAL_REPLY, "auditValReply"},
-    { GCP_CMD_NOTIFY_REPLY, "notifyReply"},
-    { GCP_CMD_SVCCHG_REPLY, "serviceChangeReply"},
-    { GCP_CMD_TOPOLOGY_REPLY, "topologyReply"},
+    { GCP_CMD_ADD_REPLY,          "addReply"},
+    { GCP_CMD_MOVE_REPLY,         "moveReply"},
+    { GCP_CMD_MOD_REPLY,          "modReply"},
+    { GCP_CMD_SUB_REPLY,          "subtractReply"},
+    { GCP_CMD_AUDITCAP_REPLY,     "auditCapReply"},
+    { GCP_CMD_AUDITVAL_REPLY,     "auditValReply"},
+    { GCP_CMD_NOTIFY_REPLY,       "notifyReply"},
+    { GCP_CMD_SVCCHG_REPLY,       "serviceChangeReply"},
+    { GCP_CMD_TOPOLOGY_REPLY,     "topologyReply"},
     { 0, NULL }
 };
 
 const value_string gcp_term_types[] = {
-    { GCP_TERM_TYPE_AAL1, "aal1" },
-    { GCP_TERM_TYPE_AAL2, "aal2" },
+    { GCP_TERM_TYPE_AAL1,        "aal1" },
+    { GCP_TERM_TYPE_AAL2,        "aal2" },
     { GCP_TERM_TYPE_AAL1_STRUCT, "aal1struct" },
-    { GCP_TERM_TYPE_IP_RTP, "ipRtp" },
-    { GCP_TERM_TYPE_TDM, "tdm" },
+    { GCP_TERM_TYPE_IP_RTP,      "ipRtp" },
+    { GCP_TERM_TYPE_TDM,         "tdm" },
     { 0, NULL }
 };
 
@@ -95,14 +95,14 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) {
     address* hi_addr;
 
     if (keep_persistent_data) {
-		wmem_tree_key_t key[3];
+        wmem_tree_key_t key[3];
 
-		key[0].length = 1;
-		key[0].key = &(framenum);
-		key[1].length = 1;
-		key[1].key = &offset;
-		key[2].length = 0;
-		key[2].key =NULL;
+        key[0].length = 1;
+        key[0].key = &(framenum);
+        key[1].length = 1;
+        key[1].key = &offset;
+        key[2].length = 0;
+        key[2].key =NULL;
 
         if (( m = (gcp_msg_t *)wmem_tree_lookup32_array(msgs,key) )) {
             m->committed = TRUE;
@@ -768,3 +768,16 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb
         }
     }
 }
+
+/*
+ * 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/gcp.h b/epan/gcp.h
index 4f341cb042..42f03da4a5 100644
--- a/epan/gcp.h
+++ b/epan/gcp.h
@@ -31,9 +31,6 @@
 #include <epan/prefs.h>
 #include <epan/asn1.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-q931.h>
 #include <epan/dissectors/packet-mtp3.h>
@@ -212,3 +209,16 @@ extern const gchar* gcp_msg_to_str(gcp_msg_t* m, gboolean persistent);
   { &(gi.hf.ctx_cmd), { "Command in Frame", n ".ctx.cmd", FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }}
 
 #endif
+
+/*
+ * 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/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c
index 977492caf6..b025cd8926 100644
--- a/epan/wslua/wslua_proto.c
+++ b/epan/wslua/wslua_proto.c
@@ -915,16 +915,16 @@ static int ProtoField_integer(lua_State* L, enum ftenum type) {
     }
 
     if (type == FT_FRAMENUM) {
-	if (base != BASE_NONE)
-	    luaL_argerror(L, 3, "ftypes.FRAMENUMs must use base.NONE");
-	else if (mask)
-	    luaL_argerror(L, 3, "ftypes.FRAMENUMs can not have a bitmask");
+        if (base != BASE_NONE)
+            luaL_argerror(L, 3, "ftypes.FRAMENUMs must use base.NONE");
+        else if (mask)
+            luaL_argerror(L, 3, "ftypes.FRAMENUMs can not have a bitmask");
     } else if (base < BASE_DEC || base > BASE_HEX_DEC) {
         luaL_argerror(L, 3, "Base must be either base.DEC, base.HEX, base.OCT,"
                       " base.DEC_HEX, base.DEC_HEX or base.HEX_DEC");
         return 0;
     } else if ((base == BASE_HEX || base == BASE_OCT) &&
-	       (type == FT_INT8 || type == FT_INT16 || type == FT_INT24 || type == FT_INT32 || type == FT_INT64)) {
+               (type == FT_INT8 || type == FT_INT16 || type == FT_INT24 || type == FT_INT32 || type == FT_INT64)) {
       luaL_argerror(L, 3, "This type does not display as hexadecimal");
       return 0;
     }
@@ -2174,7 +2174,7 @@ WSLUA_CONSTRUCTOR DissectorTable_new (lua_State *L) {
     switch(type) {
         case FT_STRING:
             base = BASE_NONE;
-	    /* fallthrough */
+            /* fallthrough */
         case FT_UINT8:
         case FT_UINT16:
         case FT_UINT24:
@@ -2645,3 +2645,16 @@ int DissectorTable_register(lua_State* L) {
     WSLUA_REGISTER_CLASS(DissectorTable);
     return 0;
 }
+
+/*
+ * 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:
+ */