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 /wiretap | |
| 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 'wiretap')
| -rw-r--r-- | wiretap/json.c | 2 | ||||
| -rw-r--r-- | wiretap/json.h | 2 | ||||
| -rw-r--r-- | wiretap/merge.c | 6 |
3 files changed, 5 insertions, 5 deletions
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: */ |