Commit e9b2859c authored by Guy Harris's avatar Guy Harris

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/14150Reviewed-by: default avatarGuy Harris <guy@alum.mit.edu>
parent 12808dea
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
//
......@@ -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:
//
......@@ -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:
*
......
......@@ -68,7 +68,7 @@ private:
*
* Local variables:
* c-basic-offset: 4
* tab-width: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
......
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*
......
......@@ -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:
*
......
......@@ -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:
*/
......@@ -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:
*/
......@@ -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:
*/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment