From: reyk <reyk@openbsd.org>
Date: Sun, 3 Aug 2014 20:43:03 +0000 (+0000)
Subject: spacing
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1c87cb6c32386523151d109116fba48252db3537;p=openbsd

spacing
---

diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index 74f5a2a354b..add2ea7e14e 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.18 2014/08/03 11:16:10 reyk Exp $	*/
+/*	$OpenBSD: parse.y,v 1.19 2014/08/03 20:43:03 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -128,7 +128,7 @@ typedef struct {
 
 %token	AUTO COMMON COMBINED CONNECTION DIRECTORY FCGI INDEX LISTEN LOCATION
 %token	LOG NO ON PORT PREFORK ROOT SERVER SOCKET TYPES
-%token	ERROR INCLUDE 
+%token	ERROR INCLUDE
 %token	<v.string>	STRING
 %token  <v.number>	NUMBER
 %type	<v.port>	port
@@ -373,15 +373,15 @@ fastcgi		: NO FCGI		{
 			srv->srv_conf.flags &= ~SRVFLAG_FCGI;
 			srv->srv_conf.flags |= SRVFLAG_NO_FCGI;
 		}
-		| FCGI				{
+		| FCGI			{
 			srv->srv_conf.flags &= ~SRVFLAG_NO_FCGI;
 			srv->srv_conf.flags |= SRVFLAG_FCGI;
 		}
-		| FCGI 				{
+		| FCGI			{
 			srv->srv_conf.flags &= ~SRVFLAG_NO_FCGI;
 			srv->srv_conf.flags |= SRVFLAG_FCGI;
 		} '{' fcgiflags_l '}'
-		| FCGI				{
+		| FCGI			{
 			srv->srv_conf.flags &= ~SRVFLAG_NO_FCGI;
 			srv->srv_conf.flags |= SRVFLAG_FCGI;
 		} fcgiflags
@@ -427,29 +427,29 @@ dirflags	: INDEX STRING		{
 		| AUTO INDEX		{
 			srv->srv_conf.flags &= ~SRVFLAG_NO_AUTO_INDEX;
 			srv->srv_conf.flags |= SRVFLAG_AUTO_INDEX;
-		}	
+		}
 		| NO AUTO INDEX		{
 			srv->srv_conf.flags &= ~SRVFLAG_AUTO_INDEX;
 			srv->srv_conf.flags |= SRVFLAG_NO_AUTO_INDEX;
 		}
 		;
 
-logformat	: LOG COMMON {
+logformat	: LOG COMMON		{
 			srv->srv_conf.flags &= ~SRVFLAG_NO_LOG;
 			srv->srv_conf.flags |= SRVFLAG_LOG;
 			srv->srv_conf.logformat = LOG_FORMAT_COMMON;
 		}
-		| LOG COMBINED {
+		| LOG COMBINED		{
 			srv->srv_conf.flags &= ~SRVFLAG_NO_LOG;
 			srv->srv_conf.flags |= SRVFLAG_LOG;
 			srv->srv_conf.logformat = LOG_FORMAT_COMBINED;
 		}
-		| LOG CONNECTION {
+		| LOG CONNECTION	{
 			srv->srv_conf.flags &= ~SRVFLAG_NO_LOG;
 			srv->srv_conf.flags |= SRVFLAG_LOG;
 			srv->srv_conf.logformat = LOG_FORMAT_CONNECTION;
 		}
-		| NO LOG {
+		| NO LOG		{
 			srv->srv_conf.flags &= ~SRVFLAG_LOG;
 			srv->srv_conf.flags |= SRVFLAG_NO_LOG;
 		}
@@ -462,7 +462,7 @@ mediaopts_l	: mediaopts_l mediaoptsl nl
 		| mediaoptsl optnl
 		;
 
-mediaoptsl	: STRING '/' STRING 			{
+mediaoptsl	: STRING '/' STRING	{
 			if (strlcpy(media.media_type, $1,
 			    sizeof(media.media_type)) >=
 			    sizeof(media.media_type) ||
@@ -1026,7 +1026,7 @@ load_config(const char *filename, struct httpd *x_conf)
 				    m.media_name);
 				errors++;
 			}
-		}		
+		}
 	}
 
 	return (errors ? -1 : 0);
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c
index 942917a890d..d52c5dbcfa6 100644
--- a/usr.sbin/httpd/server.c
+++ b/usr.sbin/httpd/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.23 2014/08/03 10:26:44 reyk Exp $	*/
+/*	$OpenBSD: server.c,v 1.24 2014/08/03 20:43:03 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -259,7 +259,7 @@ server_socket(struct sockaddr_storage *ss, in_port_t port,
 	if (reuseport) {
 		val = 1;
 		if (setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &val,
-			sizeof(int)) == -1)
+		    sizeof(int)) == -1)
 			goto bad;
 	}
 	if (fcntl(s, F_SETFL, O_NONBLOCK) == -1)
@@ -623,7 +623,7 @@ server_log(struct client *clt, const char *msg)
 			log_cb = log_debug;
 		if (EVBUFFER_LENGTH(clt->clt_log)) {
 			while ((ptr =
-			   evbuffer_readline(clt->clt_log)) != NULL) {
+			    evbuffer_readline(clt->clt_log)) != NULL) {
 				log_info("%s", ptr);
 				free(ptr);
 			}
diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c
index 29a32454d60..3ad68fc9d7f 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.16 2014/08/03 20:39:40 reyk Exp $	*/
+/*	$OpenBSD: server_fcgi.c,v 1.17 2014/08/03 20:43:03 reyk Exp $	*/
 
 /*
  * Copyright (c) 2014 Florian Obser <florian@openbsd.org>
@@ -258,7 +258,7 @@ server_fcgi(struct httpd *env, struct client *clt)
 	    desc->http_query) != -1) {
 		ret = fcgi_add_param(&param, "REQUEST_URI", str, clt);
 		free(str);
-		if (ret == -1) {	
+		if (ret == -1) {
 			errstr = "failed to encode param";
 			goto fail;
 		}