From 34afde5c73b5570d6f8cce9b49993b23b77bfb86 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Sat, 3 Apr 2021 05:54:14 +0000 Subject: [PATCH] upstream: whitespace (tab after space) OpenBSD-Commit-ID: 0e2b3f7674e985d3f7c27ff5028e690ba1c2efd4 --- chacha.h | 4 ++-- channels.h | 6 +++--- log.h | 4 ++-- servconf.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/chacha.h b/chacha.h index 762052565..19a61e294 100644 --- a/chacha.h +++ b/chacha.h @@ -1,4 +1,4 @@ -/* $OpenBSD: chacha.h,v 1.4 2016/08/27 04:04:56 guenther Exp $ */ +/* $OpenBSD: chacha.h,v 1.5 2021/04/03 05:54:14 djm Exp $ */ /* chacha-merged.c version 20080118 @@ -16,7 +16,7 @@ struct chacha_ctx { u_int input[16]; }; -#define CHACHA_MINKEYLEN 16 +#define CHACHA_MINKEYLEN 16 #define CHACHA_NONCELEN 8 #define CHACHA_CTRLEN 8 #define CHACHA_STATELEN (CHACHA_NONCELEN+CHACHA_CTRLEN) diff --git a/channels.h b/channels.h index 74e9b3f87..191a87da7 100644 --- a/channels.h +++ b/channels.h @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.135 2020/09/20 05:47:25 djm Exp $ */ +/* $OpenBSD: channels.h,v 1.136 2021/04/03 05:54:14 djm Exp $ */ /* * Author: Tatu Ylonen @@ -177,7 +177,7 @@ struct Channel { channel_filter_cleanup_fn *filter_cleanup; /* keep boundaries */ - int datagram; + int datagram; /* non-blocking connect */ /* XXX make this a pointer so the structure can be opaque */ @@ -187,7 +187,7 @@ struct Channel { mux_callback_fn *mux_rcb; void *mux_ctx; int mux_pause; - int mux_downstream_id; + int mux_downstream_id; }; #define CHAN_EXTENDED_IGNORE 0 diff --git a/log.h b/log.h index 5ec793cee..347ce0392 100644 --- a/log.h +++ b/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.30 2020/12/04 02:25:13 djm Exp $ */ +/* $OpenBSD: log.h,v 1.31 2021/04/03 05:54:14 djm Exp $ */ /* * Author: Tatu Ylonen @@ -61,7 +61,7 @@ void log_verbose_add(const char *); void log_verbose_reset(void); SyslogFacility log_facility_number(char *); -const char * log_facility_name(SyslogFacility); +const char * log_facility_name(SyslogFacility); LogLevel log_level_number(char *); const char * log_level_name(LogLevel); diff --git a/servconf.h b/servconf.h index 3ce9284fe..7ad9d6ae4 100644 --- a/servconf.h +++ b/servconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.152 2021/03/12 04:08:19 dtucker Exp $ */ +/* $OpenBSD: servconf.h,v 1.153 2021/04/03 05:54:14 djm Exp $ */ /* * Author: Tatu Ylonen @@ -236,7 +236,7 @@ typedef struct { struct connection_info { const char *user; const char *host; /* possibly resolved hostname */ - const char *address; /* remote address */ + const char *address; /* remote address */ const char *laddress; /* local address */ int lport; /* local port */ const char *rdomain; /* routing domain if available */