summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-05-08 06:45:13 +0000
committerDamien Miller <djm@mindrot.org>2015-05-08 16:46:01 +1000
commitc28a3436fa8737709ea88e4437f8f23a6ab50359 (patch)
tree8c94bf130b7c6ff404a1fe30b126da6e7fbfa72b
parent2b64c490468fd4ca35ac8d5cc31c0520dc1508bb (diff)
upstream commit
moar whitespace at eol Upstream-ID: 64eaf872a3ba52ed41e494287e80d40aaba4b515
-rw-r--r--channels.h4
-rw-r--r--dns.h4
-rw-r--r--sftp-client.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/channels.h b/channels.h
index 5a672f22e..b9b486027 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.h,v 1.116 2015/01/19 20:07:45 markus Exp $ */ 1/* $OpenBSD: channels.h,v 1.117 2015/05/08 06:45:13 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -113,7 +113,7 @@ struct Channel {
113 time_t notbefore; /* Pause IO until deadline (time_t) */ 113 time_t notbefore; /* Pause IO until deadline (time_t) */
114 int delayed; /* post-select handlers for newly created 114 int delayed; /* post-select handlers for newly created
115 * channels are delayed until the first call 115 * channels are delayed until the first call
116 * to a matching pre-select handler. 116 * to a matching pre-select handler.
117 * this way post-select handlers are not 117 * this way post-select handlers are not
118 * accidentally called if a FD gets reused */ 118 * accidentally called if a FD gets reused */
119 Buffer input; /* data read from socket, to be sent over 119 Buffer input; /* data read from socket, to be sent over
diff --git a/dns.h b/dns.h
index 815f073a1..30e2b19b3 100644
--- a/dns.h
+++ b/dns.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.h,v 1.14 2015/01/15 09:40:00 djm Exp $ */ 1/* $OpenBSD: dns.h,v 1.15 2015/05/08 06:45:13 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -33,7 +33,7 @@ enum sshfp_types {
33 SSHFP_KEY_RSA = 1, 33 SSHFP_KEY_RSA = 1,
34 SSHFP_KEY_DSA = 2, 34 SSHFP_KEY_DSA = 2,
35 SSHFP_KEY_ECDSA = 3, 35 SSHFP_KEY_ECDSA = 3,
36 SSHFP_KEY_ED25519 = 4 36 SSHFP_KEY_ED25519 = 4
37}; 37};
38 38
39enum sshfp_hashes { 39enum sshfp_hashes {
diff --git a/sftp-client.h b/sftp-client.h
index 507d763ea..f814b07d6 100644
--- a/sftp-client.h
+++ b/sftp-client.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.h,v 1.26 2015/01/14 13:54:13 djm Exp $ */ 1/* $OpenBSD: sftp-client.h,v 1.27 2015/05/08 06:45:13 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 4 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
@@ -111,7 +111,7 @@ int do_download(struct sftp_conn *, const char *, const char *,
111 Attrib *, int, int, int); 111 Attrib *, int, int, int);
112 112
113/* 113/*
114 * Recursively download 'remote_directory' to 'local_directory'. Preserve 114 * Recursively download 'remote_directory' to 'local_directory'. Preserve
115 * times if 'pflag' is set 115 * times if 'pflag' is set
116 */ 116 */
117int download_dir(struct sftp_conn *, const char *, const char *, 117int download_dir(struct sftp_conn *, const char *, const char *,
@@ -124,7 +124,7 @@ int download_dir(struct sftp_conn *, const char *, const char *,
124int do_upload(struct sftp_conn *, const char *, const char *, int, int, int); 124int do_upload(struct sftp_conn *, const char *, const char *, int, int, int);
125 125
126/* 126/*
127 * Recursively upload 'local_directory' to 'remote_directory'. Preserve 127 * Recursively upload 'local_directory' to 'remote_directory'. Preserve
128 * times if 'pflag' is set 128 * times if 'pflag' is set
129 */ 129 */
130int upload_dir(struct sftp_conn *, const char *, const char *, int, int, int, 130int upload_dir(struct sftp_conn *, const char *, const char *, int, int, int,