From c563ed636a47f28f3e965bbbc9e0af26acc9f911 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 28 Jun 2018 08:21:41 +0200 Subject: Remove vim modelines from all files If you want modelines use my vim plugin: https://github.com/cryptomilk/git-modeline.vim git config --add vim.modeline "ts=4 sw=4 et" Signed-off-by: Andreas Schneider --- include/libssh/agent.h | 1 - include/libssh/crypto.h | 1 - include/libssh/libssh.h | 1 - include/libssh/pcap.h | 1 - include/libssh/priv.h | 1 - include/libssh/sftp.h | 1 - src/agent.c | 2 -- src/auth.c | 2 -- src/auth1.c | 1 - src/base64.c | 2 -- src/buffer.c | 2 -- src/channels.c | 2 -- src/channels1.c | 1 - src/client.c | 2 -- src/connect.c | 2 -- src/crc32.c | 2 -- src/dh.c | 2 -- src/error.c | 2 -- src/gcrypt_missing.c | 1 - src/getpass.c | 2 -- src/gzip.c | 2 -- src/init.c | 2 -- src/known_hosts.c | 2 -- src/log.c | 2 -- src/match.c | 2 -- src/messages.c | 2 -- src/misc.c | 2 -- src/options.c | 2 -- src/packet1.c | 2 -- src/pcap.c | 2 -- src/pki_gcrypt.c | 2 -- src/poll.c | 4 ---- src/scp.c | 2 -- src/server.c | 2 -- src/session.c | 2 -- src/sftpserver.c | 2 -- src/socket.c | 2 -- src/string.c | 2 -- src/wrapper.c | 1 - tests/torture.c | 2 -- 40 files changed, 72 deletions(-) diff --git a/include/libssh/agent.h b/include/libssh/agent.h index c7392732..8f9ef941 100644 --- a/include/libssh/agent.h +++ b/include/libssh/agent.h @@ -115,4 +115,3 @@ ssh_string ssh_agent_sign_data(ssh_session session, #endif #endif /* __AGENT_H */ -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index fab39ed1..3a1af62d 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -152,5 +152,4 @@ struct ssh_cipher_struct { void (*cleanup)(struct ssh_cipher_struct *cipher); }; -/* vim: set ts=2 sw=2 et cindent: */ #endif /* _CRYPTO_H_ */ diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index 03241493..e78b8a27 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -774,4 +774,3 @@ LIBSSH_API uint32_t ssh_buffer_get_len(ssh_buffer buffer); } #endif #endif /* _LIBSSH_H */ -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/include/libssh/pcap.h b/include/libssh/pcap.h index ca57156b..2e43ae87 100644 --- a/include/libssh/pcap.h +++ b/include/libssh/pcap.h @@ -43,4 +43,3 @@ int ssh_pcap_context_write(ssh_pcap_context,enum ssh_pcap_direction direction, v #endif /* WITH_PCAP */ #endif /* PCAP_H_ */ -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/include/libssh/priv.h b/include/libssh/priv.h index f99e769e..17fb7e92 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -371,4 +371,3 @@ void explicit_bzero(void *s, size_t n); void ssh_agent_state_free(void *data); #endif /* _LIBSSH_PRIV_H */ -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/include/libssh/sftp.h b/include/libssh/sftp.h index a53347be..b07f269f 100644 --- a/include/libssh/sftp.h +++ b/include/libssh/sftp.h @@ -1023,4 +1023,3 @@ LIBSSH_API void sftp_handle_remove(sftp_session sftp, void *handle); #endif /* SFTP_H */ /** @} */ -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/agent.c b/src/agent.c index 0b145ff3..9c8f57ae 100644 --- a/src/agent.c +++ b/src/agent.c @@ -603,5 +603,3 @@ ssh_string ssh_agent_sign_data(ssh_session session, } #endif /* _WIN32 */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/auth.c b/src/auth.c index 69f69141..2e42a8bf 100644 --- a/src/auth.c +++ b/src/auth.c @@ -1832,5 +1832,3 @@ pending: } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/auth1.c b/src/auth1.c index a9fe58e2..e17aeb97 100644 --- a/src/auth1.c +++ b/src/auth1.c @@ -233,4 +233,3 @@ pending: } #endif /* WITH_SSH1 */ -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/base64.c b/src/base64.c index 2bb33ee6..372dc65f 100644 --- a/src/base64.c +++ b/src/base64.c @@ -288,5 +288,3 @@ unsigned char *bin_to_base64(const unsigned char *source, int len) { return base64; } - -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/buffer.c b/src/buffer.c index 5859e926..d90c3754 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1103,5 +1103,3 @@ int _ssh_buffer_unpack(struct ssh_buffer_struct *buffer, } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/channels.c b/src/channels.c index d43cc82a..38e9280c 100644 --- a/src/channels.c +++ b/src/channels.c @@ -3519,5 +3519,3 @@ error: #endif /* @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/channels1.c b/src/channels1.c index 9d63f2bf..e93f7bd6 100644 --- a/src/channels1.c +++ b/src/channels1.c @@ -395,4 +395,3 @@ ssh_channel ssh_get_channel1(ssh_session session){ return NULL; } #endif /* WITH_SSH1 */ -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/client.c b/src/client.c index 5a554647..6a5332d5 100644 --- a/src/client.c +++ b/src/client.c @@ -765,5 +765,3 @@ const char *ssh_copyright(void) { "file for information about your rights"; } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/connect.c b/src/connect.c index d7c2a32c..69bdf7ef 100644 --- a/src/connect.c +++ b/src/connect.c @@ -537,5 +537,3 @@ out: } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/crc32.c b/src/crc32.c index cb4e931d..6d5d5583 100644 --- a/src/crc32.c +++ b/src/crc32.c @@ -91,5 +91,3 @@ uint32_t ssh_crc32(const char *buf, uint32_t len) { return ret; } - -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/dh.c b/src/dh.c index e059fef1..90eda09b 100644 --- a/src/dh.c +++ b/src/dh.c @@ -1272,5 +1272,3 @@ void ssh_print_hexa(const char *descr, const unsigned char *what, size_t len) { } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/error.c b/src/error.c index f1ba945b..aa0f4624 100644 --- a/src/error.c +++ b/src/error.c @@ -137,5 +137,3 @@ int ssh_get_error_code(void *error) { } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/gcrypt_missing.c b/src/gcrypt_missing.c index edadf674..b3835f5f 100644 --- a/src/gcrypt_missing.c +++ b/src/gcrypt_missing.c @@ -100,4 +100,3 @@ char *ssh_gcry_bn2dec(bignum bn) { } #endif -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/getpass.c b/src/getpass.c index c36f263b..68dd1d46 100644 --- a/src/getpass.c +++ b/src/getpass.c @@ -284,5 +284,3 @@ int ssh_getpass(const char *prompt, } #endif - -/* vim: set ts=4 sw=4 et cindent syntax=c.doxygen: */ diff --git a/src/gzip.c b/src/gzip.c index 73cc3315..349d53fb 100644 --- a/src/gzip.c +++ b/src/gzip.c @@ -217,5 +217,3 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen){ ssh_buffer_free(dest); return 0; } - -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/init.c b/src/init.c index 241b8618..bc920f66 100644 --- a/src/init.c +++ b/src/init.c @@ -81,5 +81,3 @@ int ssh_finalize(void) { } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/known_hosts.c b/src/known_hosts.c index d8de8640..481e81ff 100644 --- a/src/known_hosts.c +++ b/src/known_hosts.c @@ -793,5 +793,3 @@ char **ssh_knownhosts_algorithms(ssh_session session) { } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/log.c b/src/log.c index 36e87775..6a868889 100644 --- a/src/log.c +++ b/src/log.c @@ -240,5 +240,3 @@ int ssh_set_log_userdata(void *data) } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/match.c b/src/match.c index c613a2e6..ab943413 100644 --- a/src/match.c +++ b/src/match.c @@ -187,5 +187,3 @@ static int match_pattern_list(const char *string, const char *pattern, int match_hostname(const char *host, const char *pattern, unsigned int len) { return match_pattern_list(host, pattern, len, 1); } - -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/messages.c b/src/messages.c index af885314..6fe87f78 100644 --- a/src/messages.c +++ b/src/messages.c @@ -1470,5 +1470,3 @@ error: #endif /* WITH_SERVER */ /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/misc.c b/src/misc.c index 9817bbfc..628218d1 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1089,5 +1089,3 @@ void explicit_bzero(void *s, size_t n) #endif /* !HAVE_EXPLICIT_BZERO */ /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/options.c b/src/options.c index adfecdc7..6bb5f30d 100644 --- a/src/options.c +++ b/src/options.c @@ -1715,5 +1715,3 @@ int ssh_bind_options_set(ssh_bind sshbind, enum ssh_bind_options_e type, #endif /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/packet1.c b/src/packet1.c index ff33ca18..1e254a34 100644 --- a/src/packet1.c +++ b/src/packet1.c @@ -369,5 +369,3 @@ SSH_PACKET_CALLBACK(ssh_packet_smsg_failure1){ #endif /* WITH_SSH1 */ - -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/pcap.c b/src/pcap.c index bfb237ba..0ec2fbb4 100644 --- a/src/pcap.c +++ b/src/pcap.c @@ -509,5 +509,3 @@ int ssh_set_pcap_file(ssh_session session, ssh_pcap_file pcapfile){ #endif /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c index 713c035f..d9d1bdd3 100644 --- a/src/pki_gcrypt.c +++ b/src/pki_gcrypt.c @@ -2271,5 +2271,3 @@ ssh_signature pki_do_sign_sessionid(const ssh_key key, #endif /* WITH_SERVER */ #endif /* HAVE_LIBGCRYPT */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/poll.c b/src/poll.c index 8872aa3c..df72c6fa 100644 --- a/src/poll.c +++ b/src/poll.c @@ -21,8 +21,6 @@ * along with the SSH Library; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. - * - * vim: ts=2 sw=2 et cindent */ #include "config.h" @@ -1044,5 +1042,3 @@ void ssh_event_free(ssh_event event) { } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/scp.c b/src/scp.c index 0208ddc5..fd9aaaaa 100644 --- a/src/scp.c +++ b/src/scp.c @@ -833,5 +833,3 @@ const char *ssh_scp_request_get_warning(ssh_scp scp){ } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/server.c b/src/server.c index 1be948f1..93fcb5e4 100644 --- a/src/server.c +++ b/src/server.c @@ -1255,5 +1255,3 @@ err: } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/session.c b/src/session.c index deaa1ae1..757f89b1 100644 --- a/src/session.c +++ b/src/session.c @@ -958,5 +958,3 @@ void ssh_set_counters(ssh_session session, ssh_counter scounter, } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/sftpserver.c b/src/sftpserver.c index b94349f7..68fdb3d2 100644 --- a/src/sftpserver.c +++ b/src/sftpserver.c @@ -515,5 +515,3 @@ void sftp_handle_remove(sftp_session sftp, void *handle) { } } } - -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/src/socket.c b/src/socket.c index 95dedbb2..8d1217bc 100644 --- a/src/socket.c +++ b/src/socket.c @@ -884,5 +884,3 @@ int ssh_socket_connect_proxycommand(ssh_socket s, const char *command){ #endif /* _WIN32 */ /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/string.c b/src/string.c index a6151aee..42ba2d92 100644 --- a/src/string.c +++ b/src/string.c @@ -274,5 +274,3 @@ void ssh_string_free(struct ssh_string_struct *s) { } /** @} */ - -/* vim: set ts=4 sw=4 et cindent: */ diff --git a/src/wrapper.c b/src/wrapper.c index 16f93274..b27d7ca8 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -476,4 +476,3 @@ int crypt_set_algorithms_server(ssh_session session){ } #endif /* WITH_SERVER */ -/* vim: set ts=2 sw=2 et cindent: */ diff --git a/tests/torture.c b/tests/torture.c index 4d94282d..9fe4ce77 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -839,5 +839,3 @@ int main(int argc, char **argv) { return torture_run_tests(); } - -/* vim: set ts=4 sw=4 et cindent syntax=c.doxygen: */ -- cgit v1.2.3