aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-02-25 13:34:07 -0800
committerGuy Harris <guy@alum.mit.edu>2016-02-25 21:34:36 +0000
commite9b2859c45d15fc30dcec2c54fab211476e21392 (patch)
treeb18d6a7a69b7adf4dbc32ba2e8cbfdb09dc2baa0
parent12808dea8107b67f3de3fa52f409ce0ab600fa16 (diff)
Clean up modelines and indentation.
HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT character as tabbing to 4-space tab stops, or that even are configurable but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are broken. tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever expect anybody to look at your file with a UN*X tool, and every text file will probably be looked at by a UN*X tool at some point, so Don't Do That. Adjust indentation to reflect the mode lines. Change-Id: Icf0831717de10fc615971fa1cf75af2f1ea2d03d Reviewed-on: https://code.wireshark.org/review/14150 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/dissectors/dcerpc/idl2wrs.c9
-rw-r--r--epan/dissectors/packet-h1.c62
-rw-r--r--epan/dissectors/packet-lbm.h6
-rw-r--r--epan/dissectors/packet-lbtrm.h6
-rw-r--r--epan/dissectors/packet-lbtru.h6
-rw-r--r--epan/dissectors/packet-lbttcp.h6
-rwxr-xr-xepan/dissectors/packet-rtitcp.c6
-rw-r--r--epan/dissectors/packet-tdmop.c6
-rw-r--r--epan/dissectors/packet-userlog.c8
-rw-r--r--epan/wslua/init_wslua.c6
-rw-r--r--epan/wslua/wslua_util.c6
-rw-r--r--extcap/extcap-base.h16
-rw-r--r--extcap/randpktdump.c8
-rw-r--r--extcap/sshdump.c8
-rw-r--r--randpkt_core/randpkt_core.c8
-rw-r--r--randpkt_core/randpkt_core.h8
-rw-r--r--ui/gtk/lbm_stream_dlg.c6
-rw-r--r--ui/gtk/lbm_stream_dlg.h6
-rw-r--r--ui/gtk/lbm_uimflow_dlg.c6
-rw-r--r--ui/gtk/lbm_uimflow_dlg.h6
-rw-r--r--ui/qt/compiled_filter_output.cpp7
-rw-r--r--ui/qt/compiled_filter_output.h6
-rw-r--r--ui/qt/enabled_protocols_dialog.cpp2
-rw-r--r--ui/qt/enabled_protocols_dialog.h2
-rw-r--r--ui/qt/lbm_lbtrm_transport_dialog.cpp6
-rw-r--r--ui/qt/lbm_lbtrm_transport_dialog.h6
-rw-r--r--ui/qt/lbm_lbtru_transport_dialog.cpp6
-rw-r--r--ui/qt/lbm_lbtru_transport_dialog.h6
-rw-r--r--ui/qt/lbm_stream_dialog.cpp6
-rw-r--r--ui/qt/lbm_stream_dialog.h6
-rw-r--r--ui/qt/lbm_uimflow_dialog.cpp6
-rw-r--r--ui/qt/lbm_uimflow_dialog.h6
-rw-r--r--wiretap/json.c2
-rw-r--r--wiretap/json.h2
-rw-r--r--wiretap/merge.c6
-rw-r--r--wsutil/jsmn.c10
-rw-r--r--wsutil/jsmn.h8
37 files changed, 145 insertions, 147 deletions
diff --git a/epan/dissectors/dcerpc/idl2wrs.c b/epan/dissectors/dcerpc/idl2wrs.c
index 66104884a4..93d5ee116a 100644
--- a/epan/dissectors/dcerpc/idl2wrs.c
+++ b/epan/dissectors/dcerpc/idl2wrs.c
@@ -3518,12 +3518,11 @@ int main(int argc, char *argv[])
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
* indent-tabs-mode: t
* End:
*
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/
-
diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c
index 014f817d42..43369049e3 100644
--- a/epan/dissectors/packet-h1.c
+++ b/epan/dissectors/packet-h1.c
@@ -50,44 +50,44 @@ static dissector_handle_t data_handle;
#define RESPONSE_BLOCK 0x0F
static const value_string block_type_vals[] = {
- { EMPTY_BLOCK, "Empty Block" },
- { OPCODE_BLOCK, "Opcode Block" },
- { REQUEST_BLOCK, "Request Block" },
- { RESPONSE_BLOCK, "Response Block" },
- {0, NULL}
+ { EMPTY_BLOCK, "Empty Block" },
+ { OPCODE_BLOCK, "Opcode Block" },
+ { REQUEST_BLOCK, "Request Block" },
+ { RESPONSE_BLOCK, "Response Block" },
+ {0, NULL}
};
static const value_string opcode_vals[] = {
- {3, "Write Request"},
- {4, "Write Response"},
- {5, "Read Request"},
- {6, "Read Response"},
- {0, NULL}
+ {3, "Write Request"},
+ {4, "Write Response"},
+ {5, "Read Request"},
+ {6, "Read Response"},
+ {0, NULL}
};
static const value_string org_vals[] = {
- {0x01, "DB"},
- {0x02, "MB"},
- {0x03, "EB"},
- {0x04, "AB"},
- {0x05, "PB"},
- {0x06, "ZB"},
- {0x07, "TB"},
- {0x08, "BS"},
- {0x09, "AS"},
- {0x0a, "DX"},
- {0x10, "DE"},
- {0x11, "QB"},
- {0, NULL}
+ {0x01, "DB"},
+ {0x02, "MB"},
+ {0x03, "EB"},
+ {0x04, "AB"},
+ {0x05, "PB"},
+ {0x06, "ZB"},
+ {0x07, "TB"},
+ {0x08, "BS"},
+ {0x09, "AS"},
+ {0x0a, "DX"},
+ {0x10, "DE"},
+ {0x11, "QB"},
+ {0, NULL}
};
static const value_string returncode_vals[] = {
- {0x00, "No error"},
- {0x02, "Requested block does not exist"},
- {0x03, "Requested block too small"},
- {0xFF, "Error, reason unknown"},
- {0, NULL}
+ {0x00, "No error"},
+ {0x02, "Requested block does not exist"},
+ {0x03, "Requested block too small"},
+ {0xFF, "Error, reason unknown"},
+ {0, NULL}
};
static gint ett_h1 = -1;
@@ -273,10 +273,10 @@ proto_reg_handoff_h1(void)
*
* Local Variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * ex: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/epan/dissectors/packet-lbm.h b/epan/dissectors/packet-lbm.h
index ec0bef2c68..0b9deb901e 100644
--- a/epan/dissectors/packet-lbm.h
+++ b/epan/dissectors/packet-lbm.h
@@ -435,10 +435,10 @@ void lbm_topic_add(guint64 channel, guint32 topic_index, const char * name);
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/epan/dissectors/packet-lbtrm.h b/epan/dissectors/packet-lbtrm.h
index 5d14d980c0..86daf741f6 100644
--- a/epan/dissectors/packet-lbtrm.h
+++ b/epan/dissectors/packet-lbtrm.h
@@ -55,10 +55,10 @@ char * lbtrm_transport_source_string(const address * source_address, guint16 sou
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/epan/dissectors/packet-lbtru.h b/epan/dissectors/packet-lbtru.h
index f5be46b854..efea017255 100644
--- a/epan/dissectors/packet-lbtru.h
+++ b/epan/dissectors/packet-lbtru.h
@@ -66,10 +66,10 @@ char * lbtru_transport_source_string(const address * source_address, guint16 sou
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/epan/dissectors/packet-lbttcp.h b/epan/dissectors/packet-lbttcp.h
index c0d9ff99be..d805c2cfa4 100644
--- a/epan/dissectors/packet-lbttcp.h
+++ b/epan/dissectors/packet-lbttcp.h
@@ -56,10 +56,10 @@ void lbttcp_transport_sid_add(const address * source_address, guint16 source_por
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c
index 4e6866d5bb..1daa98d987 100755
--- a/epan/dissectors/packet-rtitcp.c
+++ b/epan/dissectors/packet-rtitcp.c
@@ -983,10 +983,10 @@ proto_reg_handoff_rtitcp(void)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/epan/dissectors/packet-tdmop.c b/epan/dissectors/packet-tdmop.c
index a2e32f940d..677649be2c 100644
--- a/epan/dissectors/packet-tdmop.c
+++ b/epan/dissectors/packet-tdmop.c
@@ -387,10 +387,10 @@ void proto_reg_handoff_tdmop(void)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/epan/dissectors/packet-userlog.c b/epan/dissectors/packet-userlog.c
index a33d24002b..22f42995d3 100644
--- a/epan/dissectors/packet-userlog.c
+++ b/epan/dissectors/packet-userlog.c
@@ -422,11 +422,11 @@ proto_reg_handoff_userlog(void)
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
* indent-tabs-mode: t
* End:
*
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/
diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c
index 94947ad03f..e76f3e8d8d 100644
--- a/epan/wslua/init_wslua.c
+++ b/epan/wslua/init_wslua.c
@@ -1004,10 +1004,10 @@ lua_State* wslua_state(void) { return L; }
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c
index 2b66cf0dcd..f056960747 100644
--- a/epan/wslua/wslua_util.c
+++ b/epan/wslua/wslua_util.c
@@ -356,10 +356,10 @@ WSLUA_FUNCTION wslua_register_stat_cmd_arg(lua_State* L) {
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/extcap/extcap-base.h b/extcap/extcap-base.h
index 9da001a87b..83500e449e 100644
--- a/extcap/extcap-base.h
+++ b/extcap/extcap-base.h
@@ -76,12 +76,12 @@
#define EXTCAP_BASE_OPTIONS \
{ "extcap-interfaces", no_argument, NULL, OPT_LIST_INTERFACES}, \
- { "extcap-dlts", no_argument, NULL, OPT_LIST_DLTS}, \
+ { "extcap-dlts", no_argument, NULL, OPT_LIST_DLTS}, \
{ "extcap-interface", required_argument, NULL, OPT_INTERFACE}, \
- { "extcap-config", no_argument, NULL, OPT_CONFIG}, \
- { "capture", no_argument, NULL, OPT_CAPTURE}, \
+ { "extcap-config", no_argument, NULL, OPT_CONFIG}, \
+ { "capture", no_argument, NULL, OPT_CAPTURE}, \
{ "extcap-capture-filter", required_argument, NULL, OPT_CAPTURE_FILTER}, \
- { "fifo", required_argument, NULL, OPT_FIFO} \
+ { "fifo", required_argument, NULL, OPT_FIFO} \
#endif
@@ -89,11 +89,11 @@
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
* indent-tabs-mode: t
* End:
*
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/
diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index c31293e595..c808fbaf74 100644
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -445,11 +445,11 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
* indent-tabs-mode: t
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 expandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/
diff --git a/extcap/sshdump.c b/extcap/sshdump.c
index 016d9d27b0..c57de0bdd2 100644
--- a/extcap/sshdump.c
+++ b/extcap/sshdump.c
@@ -814,11 +814,11 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
* indent-tabs-mode: t
* End:
*
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/
diff --git a/randpkt_core/randpkt_core.c b/randpkt_core/randpkt_core.c
index c3b977e951..21739b082a 100644
--- a/randpkt_core/randpkt_core.c
+++ b/randpkt_core/randpkt_core.c
@@ -795,11 +795,11 @@ void randpkt_example_list(const char*** abbrev_list, const char*** longname_list
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
* indent-tabs-mode: t
* End:
*
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/
diff --git a/randpkt_core/randpkt_core.h b/randpkt_core/randpkt_core.h
index 35265480cb..f7633fc048 100644
--- a/randpkt_core/randpkt_core.h
+++ b/randpkt_core/randpkt_core.h
@@ -74,11 +74,11 @@ gboolean randpkt_example_close(randpkt_example* example);
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
* indent-tabs-mode: t
* End:
*
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/
diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c
index 18ddbbf6d6..d3fea45ce1 100644
--- a/ui/gtk/lbm_stream_dlg.c
+++ b/ui/gtk/lbm_stream_dlg.c
@@ -766,10 +766,10 @@ void lbmc_stream_dlg_stream_menu_cb(gpointer arg _U_)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/gtk/lbm_stream_dlg.h b/ui/gtk/lbm_stream_dlg.h
index b82f14967d..ff6a9ce04e 100644
--- a/ui/gtk/lbm_stream_dlg.h
+++ b/ui/gtk/lbm_stream_dlg.h
@@ -36,10 +36,10 @@ void lbmc_stream_dlg_stream_menu_cb(gpointer arg);
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c
index 477c067e4c..b0993547b6 100644
--- a/ui/gtk/lbm_uimflow_dlg.c
+++ b/ui/gtk/lbm_uimflow_dlg.c
@@ -425,10 +425,10 @@ void lbmc_uim_flow_menu_cb(gpointer arg _U_)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/gtk/lbm_uimflow_dlg.h b/ui/gtk/lbm_uimflow_dlg.h
index 991f8b437a..c7260d0f56 100644
--- a/ui/gtk/lbm_uimflow_dlg.h
+++ b/ui/gtk/lbm_uimflow_dlg.h
@@ -36,10 +36,10 @@ void lbmc_uim_flow_menu_cb(gpointer arg);
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp
index 7ccdb86988..703857ed08 100644
--- a/ui/qt/compiled_filter_output.cpp
+++ b/ui/qt/compiled_filter_output.cpp
@@ -128,11 +128,10 @@ void CompiledFilterOutput::copyFilterText()
//
// Local variables:
// c-basic-offset: 4
-// tab-width: 4
+// tab-width: 8
// indent-tabs-mode: nil
// End:
//
-// vi: set shiftwidth=4 tabstop=4 expandtab:
-// :indentSize=4:tabSize=4:noTabs=true:
+// vi: set shiftwidth=4 tabstop=8 expandtab:
+// :indentSize=4:tabSize=8:noTabs=true:
//
-
diff --git a/ui/qt/compiled_filter_output.h b/ui/qt/compiled_filter_output.h
index f2a3d90c3f..44642a88e7 100644
--- a/ui/qt/compiled_filter_output.h
+++ b/ui/qt/compiled_filter_output.h
@@ -65,10 +65,10 @@ private slots:
//
// Local variables:
// c-basic-offset: 4
-// tab-width: 4
+// tab-width: 8
// indent-tabs-mode: nil
// End:
//
-// vi: set shiftwidth=4 tabstop=4 expandtab:
-// :indentSize=4:tabSize=4:noTabs=true:
+// vi: set shiftwidth=4 tabstop=8 expandtab:
+// :indentSize=4:tabSize=8:noTabs=true:
//
diff --git a/ui/qt/enabled_protocols_dialog.cpp b/ui/qt/enabled_protocols_dialog.cpp
index 283f2ab0f6..143611a952 100644
--- a/ui/qt/enabled_protocols_dialog.cpp
+++ b/ui/qt/enabled_protocols_dialog.cpp
@@ -345,7 +345,7 @@ void EnabledProtocolsDialog::on_buttonBox_helpRequested()
*
* Local Variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
diff --git a/ui/qt/enabled_protocols_dialog.h b/ui/qt/enabled_protocols_dialog.h
index 761a4f4ec9..6f84a92b21 100644
--- a/ui/qt/enabled_protocols_dialog.h
+++ b/ui/qt/enabled_protocols_dialog.h
@@ -68,7 +68,7 @@ private:
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index 8bf3553aa3..a2ff0118a5 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -1635,10 +1635,10 @@ void LBMLBTRMTransportDialog::actionSourceAutoResizeColumns_triggered(void)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h
index a686e99f5a..bb0f75962e 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.h
+++ b/ui/qt/lbm_lbtrm_transport_dialog.h
@@ -126,10 +126,10 @@ class LBMLBTRMTransportDialog : public QDialog
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index 190ff5ae71..304c38c6bc 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -2233,10 +2233,10 @@ void LBMLBTRUTransportDialog::actionReceiverAutoResizeColumns_triggered(void)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h
index 48b2b79396..25d3ac64b6 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.h
+++ b/ui/qt/lbm_lbtru_transport_dialog.h
@@ -150,10 +150,10 @@ class LBMLBTRUTransportDialog : public QDialog
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp
index b687cfc9a5..f9970bedbe 100644
--- a/ui/qt/lbm_stream_dialog.cpp
+++ b/ui/qt/lbm_stream_dialog.cpp
@@ -443,10 +443,10 @@ void LBMStreamDialog::closeDialog(void)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/qt/lbm_stream_dialog.h b/ui/qt/lbm_stream_dialog.h
index 53abf26d4b..8310b0a28d 100644
--- a/ui/qt/lbm_stream_dialog.h
+++ b/ui/qt/lbm_stream_dialog.h
@@ -76,10 +76,10 @@ class LBMStreamDialog : public QDialog
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp
index f1b74517be..b34c57b81e 100644
--- a/ui/qt/lbm_uimflow_dialog.cpp
+++ b/ui/qt/lbm_uimflow_dialog.cpp
@@ -662,10 +662,10 @@ void LBMUIMFlowDialog::on_actionMoveDown1_triggered(void)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/ui/qt/lbm_uimflow_dialog.h b/ui/qt/lbm_uimflow_dialog.h
index 0e68a8f33e..c77f126804 100644
--- a/ui/qt/lbm_uimflow_dialog.h
+++ b/ui/qt/lbm_uimflow_dialog.h
@@ -110,10 +110,10 @@ class LBMUIMFlowDialog : public QDialog
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/wiretap/json.c b/wiretap/json.c
index e7cf2d68a8..7f631cd956 100644
--- a/wiretap/json.c
+++ b/wiretap/json.c
@@ -140,7 +140,7 @@ wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info)
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
diff --git a/wiretap/json.h b/wiretap/json.h
index 704e155eee..0e792d9224 100644
--- a/wiretap/json.h
+++ b/wiretap/json.h
@@ -46,7 +46,7 @@ wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info);
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
diff --git a/wiretap/merge.c b/wiretap/merge.c
index f2e92e384a..83ad2f35e6 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -1077,10 +1077,10 @@ merge_files(int out_fd, const gchar* out_filename, const int file_type,
*
* Local Variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
diff --git a/wsutil/jsmn.c b/wsutil/jsmn.c
index 79cf363fff..4a505dbb94 100644
--- a/wsutil/jsmn.c
+++ b/wsutil/jsmn.c
@@ -385,11 +385,11 @@ gboolean jsmn_is_json(const guint8* buf, const size_t len)
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/
diff --git a/wsutil/jsmn.h b/wsutil/jsmn.h
index e4817dac5b..7cf51aa81c 100644
--- a/wsutil/jsmn.h
+++ b/wsutil/jsmn.h
@@ -109,11 +109,11 @@ WS_DLL_PUBLIC gboolean jsmn_is_json(const guint8* buf, const size_t len);
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
* indent-tabs-mode: t
* End:
*
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=8:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
*/