diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-02-25 13:34:07 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-02-25 21:34:36 +0000 |
commit | e9b2859c45d15fc30dcec2c54fab211476e21392 (patch) | |
tree | b18d6a7a69b7adf4dbc32ba2e8cbfdb09dc2baa0 /epan | |
parent | 12808dea8107b67f3de3fa52f409ce0ab600fa16 (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>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/dcerpc/idl2wrs.c | 9 | ||||
-rw-r--r-- | epan/dissectors/packet-h1.c | 62 | ||||
-rw-r--r-- | epan/dissectors/packet-lbm.h | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-lbtrm.h | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-lbtru.h | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-lbttcp.h | 6 | ||||
-rwxr-xr-x | epan/dissectors/packet-rtitcp.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-tdmop.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-userlog.c | 8 | ||||
-rw-r--r-- | epan/wslua/init_wslua.c | 6 | ||||
-rw-r--r-- | epan/wslua/wslua_util.c | 6 |
11 files changed, 63 insertions, 64 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: */ |