From: reyk <reyk@openbsd.org>
Date: Thu, 22 Jan 2015 15:21:28 +0000 (+0000)
Subject: spacing
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1ab70d2179fdbc0a6a4cd8a6da881f021005a1c5;p=openbsd

spacing
---

diff --git a/usr.sbin/relayd/agentx.c b/usr.sbin/relayd/agentx.c
index bfc9b25e795..24b07de8092 100644
--- a/usr.sbin/relayd/agentx.c
+++ b/usr.sbin/relayd/agentx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: agentx.c,v 1.9 2014/12/21 00:54:49 guenther Exp $    */
+/*      $OpenBSD: agentx.c,v 1.10 2015/01/22 15:21:28 reyk Exp $    */
 /*
  * Copyright (c) 2013,2014 Bret Stephen Lambert <blambert@openbsd.org>
  *
@@ -913,7 +913,8 @@ snmp_agentx_do_read_oid(struct agentx_pdu *pdu, struct snmp_oid *oid,
 }
 
 int
-snmp_agentx_read_searchrange(struct agentx_pdu *pdu, struct agentx_search_range *sr)
+snmp_agentx_read_searchrange(struct agentx_pdu *pdu,
+    struct agentx_search_range *sr)
 {
 	if (snmp_agentx_do_read_oid(pdu, &sr->start, &sr->include) == -1 ||
 	    snmp_agentx_read_oid(pdu, &sr->end) == -1)
@@ -1075,7 +1076,7 @@ snmp_agentx_dump_hdr(struct agentx_hdr *hdr)
 		return;
 	}
 
-	fprintf(stderr, 
+	fprintf(stderr,
 	    "agentx: version %d type %s flags %d reserved %d"
 	    " sessionid %d transactid %d packetid %d length %d",
 	    hdr->version, snmp_agentx_type2name(hdr->type), hdr->flags,
diff --git a/usr.sbin/relayd/pfe_filter.c b/usr.sbin/relayd/pfe_filter.c
index a78a5d39303..7a4fc4defbb 100644
--- a/usr.sbin/relayd/pfe_filter.c
+++ b/usr.sbin/relayd/pfe_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_filter.c,v 1.56 2015/01/21 21:50:33 deraadt Exp $	*/
+/*	$OpenBSD: pfe_filter.c,v 1.57 2015/01/22 15:21:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -445,7 +445,8 @@ sync_ruleset(struct relayd *env, struct rdr *rdr, int enable)
 
 		if (rio.rule.proto == IPPROTO_TCP)
 			rio.rule.timeout[PFTM_TCP_ESTABLISHED] =
-			    (u_int32_t)MINIMUM(rdr->conf.timeout.tv_sec, INT_MAX);
+			    (u_int32_t)MINIMUM(rdr->conf.timeout.tv_sec,
+			    INT_MAX);
 
 		if (strlen(rdr->conf.tag))
 			(void)strlcpy(rio.rule.tagname, rdr->conf.tag,
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c
index f69a91228db..d63787e2107 100644
--- a/usr.sbin/relayd/relay.c
+++ b/usr.sbin/relayd/relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.188 2015/01/22 09:26:05 reyk Exp $	*/
+/*	$OpenBSD: relay.c,v 1.189 2015/01/22 15:21:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -2411,7 +2411,7 @@ relay_tls_writecb(int fd, short event, void *arg)
 		goto err;
 	}
 
-        if (cre->tlsreneg_state == TLSRENEG_ABORT) {
+	if (cre->tlsreneg_state == TLSRENEG_ABORT) {
 		what |= EVBUFFER_ERROR;
 		goto err;
 	}
diff --git a/usr.sbin/relayd/relay_http.c b/usr.sbin/relayd/relay_http.c
index 99b804d06f5..7ab81b28d4c 100644
--- a/usr.sbin/relayd/relay_http.c
+++ b/usr.sbin/relayd/relay_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_http.c,v 1.41 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: relay_http.c,v 1.42 2015/01/22 15:21:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -1252,7 +1252,8 @@ relay_httpheader_test(struct ctl_relay_event *cre, struct relay_rule *rule,
 		/* Fail if header doesn't exist */
 		return (-1);
 	} else {
-		if (fnmatch(kv->kv_key, match->kv_key, FNM_CASEFOLD) == FNM_NOMATCH)
+		if (fnmatch(kv->kv_key, match->kv_key,
+		    FNM_CASEFOLD) == FNM_NOMATCH)
 			return (-1);
 		if (kv->kv_value != NULL &&
 		    match->kv_value != NULL &&
@@ -1537,7 +1538,7 @@ relay_apply_actions(struct ctl_relay_event *cre, struct kvlist *actions)
 		}
 
  matchdel:
-		switch(kv->kv_option) {
+		switch (kv->kv_option) {
 		case KEY_OPTION_LOG:
 			if (match == NULL)
 				break;
@@ -1546,10 +1547,10 @@ relay_apply_actions(struct ctl_relay_event *cre, struct kvlist *actions)
 				goto fail;
 			if (mp->kv_flags & KV_FLAG_INVALID) {
 				if (kv_set(mp, "%s (removed)",
-				   mp->kv_value) == -1)
+				    mp->kv_value) == -1)
 					goto fail;
 			}
-			switch(kv->kv_type) {
+			switch (kv->kv_type) {
 			case KEY_TYPE_URL:
 				key.kv_key = "Host";
 				host = kv_find(&desc->http_headers, &key);
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index b5fdf917ecf..6fd07f03918 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.136 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.137 2015/01/22 15:21:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -968,7 +968,7 @@ rule_inherit(struct relay_rule *rule)
 			continue;
 		if (kv_inherit(&r->rule_kv[i], kv) == NULL) {
 			free(r);
-			return(NULL);
+			return (NULL);
 		}
 	}
 
@@ -1009,7 +1009,7 @@ void
 rule_settable(struct relay_rules *rules, struct relay_table *rlt)
 {
 	struct relay_rule	*r;
-	char		 	 pname[TABLE_NAME_SIZE];
+	char			 pname[TABLE_NAME_SIZE];
 
 	if (rlt->rlt_table == NULL || strlcpy(pname, rlt->rlt_table->conf.name,
 	    sizeof(pname)) >= sizeof(pname))