spacing

5 files changed, 16 insertions, 15 deletions

diff --git a/usr.sbin/httpd/config.c b/usr.sbin/httpd/config.c
index cc6b875ab11..50595abbd1f 100644
--- a/usr.sbin/httpd/config.c
+++ b/usr.sbin/httpd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.56 2019/02/19 11:37:26 pirofti Exp $	*/
+/*	$OpenBSD: config.c,v 1.57 2019/05/08 19:57:45 reyk Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -301,8 +301,8 @@ int
 config_getserver_fcgiparams(struct httpd *env, struct imsg *imsg)
 {
 	struct server		*srv;
-	struct server_config 	*srv_conf, *iconf;
-	struct fastcgi_param 	*fp;
+	struct server_config	*srv_conf, *iconf;
+	struct fastcgi_param	*fp;
 	uint32_t		 id;
 	size_t			 c, nc, len;
 	uint8_t			*p = imsg->data;
diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h
index e599e88c56c..b1f17af8cd7 100644
--- a/usr.sbin/httpd/httpd.h
+++ b/usr.sbin/httpd/httpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: httpd.h,v 1.144 2019/05/03 17:16:27 tb Exp $	*/
+/*	$OpenBSD: httpd.h,v 1.145 2019/05/08 19:57:45 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -475,7 +475,7 @@ struct fastcgi_param {
 	char			name[HTTPD_FCGI_NAME_MAX];
 	char			value[HTTPD_FCGI_VAL_MAX];
 
-	TAILQ_ENTRY(fastcgi_param) entry;	
+	TAILQ_ENTRY(fastcgi_param) entry;
 };
 TAILQ_HEAD(server_fcgiparams, fastcgi_param);
 
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index 84b9d601f43..ead70654e87 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.111 2019/05/03 17:16:27 tb Exp $	*/
+/*	$OpenBSD: parse.y,v 1.112 2019/05/08 19:57:45 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -316,7 +316,7 @@ server		: SERVER optmatch STRING	{
 			}
 
 			if ((s = server_match(srv, 0)) != NULL) {
-				if ((s->srv_conf.flags & SRVFLAG_TLS) != 
+				if ((s->srv_conf.flags & SRVFLAG_TLS) !=
 				    (srv->srv_conf.flags & SRVFLAG_TLS)) {
 					yyerror("server \"%s\": tls and "
 					    "non-tls on same address/port",
@@ -426,7 +426,7 @@ serveropts_l	: serveropts_l serveroptsl nl
 		| serveroptsl optnl
 		;
 
-serveroptsl	: LISTEN ON STRING opttls port 		{
+serveroptsl	: LISTEN ON STRING opttls port	{
 			if (listen_on($3, $4, &$5) == -1) {
 				free($3);
 				YYERROR;
diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c
index bdd150fa932..0fae76cef3c 100644
--- a/usr.sbin/httpd/server_fcgi.c
+++ b/usr.sbin/httpd/server_fcgi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_fcgi.c,v 1.78 2019/02/19 11:37:26 pirofti Exp $	*/
+/*	$OpenBSD: server_fcgi.c,v 1.79 2019/05/08 19:57:45 reyk Exp $	*/
 
 /*
  * Copyright (c) 2014 Florian Obser <florian@openbsd.org>
@@ -92,7 +92,7 @@ server_fcgi(struct httpd *env, struct client *clt)
 	struct http_descriptor		*desc = clt->clt_descreq;
 	struct fcgi_record_header	*h;
 	struct fcgi_begin_request_body	*begin;
-	struct fastcgi_param 		*fcgiparam;
+	struct fastcgi_param		*fcgiparam;
 	char				 hbuf[HOST_NAME_MAX+1];
 	size_t				 scriptlen;
 	int				 pathlen;
@@ -297,7 +297,8 @@ server_fcgi(struct httpd *env, struct client *clt)
 	}
 
 	TAILQ_FOREACH(fcgiparam, &srv_conf->fcgiparams, entry) {
-		if (fcgi_add_param(&param, fcgiparam->name, fcgiparam->value, clt) == -1) {
+		if (fcgi_add_param(&param, fcgiparam->name, fcgiparam->value,
+		    clt) == -1) {
 			errstr = "failed to encode param";
 			goto fail;
 		}
diff --git a/usr.sbin/httpd/server_http.c b/usr.sbin/httpd/server_http.c
index ef45d884fc0..98238b6aa65 100644
--- a/usr.sbin/httpd/server_http.c
+++ b/usr.sbin/httpd/server_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_http.c,v 1.130 2019/05/03 17:16:27 tb Exp $	*/
+/*	$OpenBSD: server_http.c,v 1.131 2019/05/08 19:57:45 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2018 Reyk Floeter <reyk@openbsd.org>
@@ -1720,7 +1720,7 @@ server_log_http(struct client *clt, unsigned int code, size_t len)
 		    (srv_conf->tls_flags & TLSFLAG_CA) &&
 		    tls_peer_cert_subject(clt->clt_tls_ctx) != NULL &&
 		    stravis(&user, tls_peer_cert_subject(clt->clt_tls_ctx),
-				HTTPD_LOGVIS) == -1)
+		    HTTPD_LOGVIS) == -1)
 			goto done;
 		if (desc->http_version &&
 		    stravis(&version, desc->http_version, HTTPD_LOGVIS) == -1)
@@ -1768,8 +1768,8 @@ server_log_http(struct client *clt, unsigned int code, size_t len)
 			goto finish;
 
 		key.kv_key = "X-Forwarded-Port";
-		if ((xfp = kv_find(&desc->http_headers, &key)) != NULL
-		   && xfp->kv_value == NULL)
+		if ((xfp = kv_find(&desc->http_headers, &key)) != NULL &&
+		    (xfp->kv_value == NULL))
 			xfp = NULL;
 
 		if (xfp &&