summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2017-01-17 22:10:57 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2017-01-17 22:10:57 +0000
commitd1cc78f2f054530923e25b25d454028b601435ce (patch)
treecf271a6660395fd311ea8056771e59c5f89f0f0a
parentca24d3f0c085ed9f6af36784341225114bc284c2 (diff)
Nuke some whitespace that keeps poking me in the eye as I try to
steal code.
-rw-r--r--sbin/iked/control.c4
-rw-r--r--usr.sbin/bgpd/config.c4
-rw-r--r--usr.sbin/httpd/proc.c4
-rw-r--r--usr.sbin/ldapd/log.c4
-rw-r--r--usr.sbin/ldomctl/config.c6
-rw-r--r--usr.sbin/ripd/control.c4
-rw-r--r--usr.sbin/snmpd/proc.c4
-rw-r--r--usr.sbin/switchd/control.c4
-rw-r--r--usr.sbin/switchd/proc.c4
9 files changed, 19 insertions, 19 deletions
diff --git a/sbin/iked/control.c b/sbin/iked/control.c
index 4126d35ae1e..6580584e930 100644
--- a/sbin/iked/control.c
+++ b/sbin/iked/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.24 2017/01/09 14:49:21 reyk Exp $ */
+/* $OpenBSD: control.c,v 1.25 2017/01/17 22:10:55 krw Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -64,7 +64,7 @@ control_run(struct privsep *ps, struct privsep_proc *p, void *arg)
{
/*
* pledge in the control process:
- * stdio - for malloc and basic I/O including events.
+ * stdio - for malloc and basic I/O including events.
* cpath - for unlinking the control socket.
* unix - for the control socket.
*/
diff --git a/usr.sbin/bgpd/config.c b/usr.sbin/bgpd/config.c
index 1dfd765b591..0a1aa593eb9 100644
--- a/usr.sbin/bgpd/config.c
+++ b/usr.sbin/bgpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.63 2016/01/26 18:35:01 mmcc Exp $ */
+/* $OpenBSD: config.c,v 1.64 2017/01/17 22:10:55 krw Exp $ */
/*
* Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -179,7 +179,7 @@ merge_config(struct bgpd_config *xconf, struct bgpd_config *conf,
/* clear all current filters and take over the new ones */
filterlist_free(xconf->filters);
- xconf->filters = conf->filters;
+ xconf->filters = conf->filters;
conf->filters = NULL;
/* switch the network statements, but first remove the old ones */
diff --git a/usr.sbin/httpd/proc.c b/usr.sbin/httpd/proc.c
index a1014eb30ab..7ddc01e8462 100644
--- a/usr.sbin/httpd/proc.c
+++ b/usr.sbin/httpd/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.35 2017/01/09 14:49:22 reyk Exp $ */
+/* $OpenBSD: proc.c,v 1.36 2017/01/17 22:10:55 krw Exp $ */
/*
* Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -208,7 +208,7 @@ proc_init(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc,
proc_setup(ps, procs, nproc);
/*
- * Create the children sockets so we can use them
+ * Create the children sockets so we can use them
* to distribute the rest of the socketpair()s using
* proc_connect() later.
*/
diff --git a/usr.sbin/ldapd/log.c b/usr.sbin/ldapd/log.c
index 5afdd7a4b9c..b2d2c7a0a46 100644
--- a/usr.sbin/ldapd/log.c
+++ b/usr.sbin/ldapd/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.4 2013/11/02 13:31:51 deraadt Exp $ */
+/* $OpenBSD: log.c,v 1.5 2017/01/17 22:10:55 krw Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -77,7 +77,7 @@ vlog(int pri, const char *fmt, va_list ap)
time_t now;
if (debug) {
- gettimeofday(&tv, NULL);
+ gettimeofday(&tv, NULL);
now = tv.tv_sec;
tm = localtime(&now);
rc = strftime(datebuf, sizeof(datebuf), "%b %e %H:%M:%S", tm);
diff --git a/usr.sbin/ldomctl/config.c b/usr.sbin/ldomctl/config.c
index b68ffef92d1..6ad09f4c299 100644
--- a/usr.sbin/ldomctl/config.c
+++ b/usr.sbin/ldomctl/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.21 2014/09/28 18:42:50 kettenis Exp $ */
+/* $OpenBSD: config.c,v 1.22 2017/01/17 22:10:55 krw Exp $ */
/*
* Copyright (c) 2012 Mark Kettenis
@@ -869,7 +869,7 @@ hvmd_finalize_maus(struct md *md)
node = md_add_node(md, "maus");
md_link_node(md, parent, node);
-
+
if (have_cwqs) {
node = md_add_node(md, "cwqs");
md_link_node(md, parent, node);
@@ -2306,7 +2306,7 @@ build_config(const char *filename)
pri_alloc_memory(hv_membase, hv_memsize);
num_cpus = primary_num_cpus = 0;
- memory = primary_memory = 0;
+ memory = primary_memory = 0;
SIMPLEQ_FOREACH(domain, &conf.domain_list, entry) {
if (strcmp(domain->name, "primary") == 0) {
primary_num_cpus = domain->vcpu;
diff --git a/usr.sbin/ripd/control.c b/usr.sbin/ripd/control.c
index 28eddc55102..a36e65c40e1 100644
--- a/usr.sbin/ripd/control.c
+++ b/usr.sbin/ripd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.24 2017/01/08 23:04:42 krw Exp $ */
+/* $OpenBSD: control.c,v 1.25 2017/01/17 22:10:56 krw Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -291,7 +291,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
memcpy(&verbose, imsg.data, sizeof(verbose));
log_verbose(verbose);
- break;
+ break;
default:
log_debug("control_dispatch_imsg: "
"error handling imsg %d", imsg.hdr.type);
diff --git a/usr.sbin/snmpd/proc.c b/usr.sbin/snmpd/proc.c
index cd5b7606163..78dcba92615 100644
--- a/usr.sbin/snmpd/proc.c
+++ b/usr.sbin/snmpd/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.22 2017/01/09 14:49:22 reyk Exp $ */
+/* $OpenBSD: proc.c,v 1.23 2017/01/17 22:10:56 krw Exp $ */
/*
* Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -208,7 +208,7 @@ proc_init(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc,
proc_setup(ps, procs, nproc);
/*
- * Create the children sockets so we can use them
+ * Create the children sockets so we can use them
* to distribute the rest of the socketpair()s using
* proc_connect() later.
*/
diff --git a/usr.sbin/switchd/control.c b/usr.sbin/switchd/control.c
index 9367f32c16e..9cc78fb3745 100644
--- a/usr.sbin/switchd/control.c
+++ b/usr.sbin/switchd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.7 2017/01/09 14:49:22 reyk Exp $ */
+/* $OpenBSD: control.c,v 1.8 2017/01/17 22:10:56 krw Exp $ */
/*
* Copyright (c) 2010-2016 Reyk Floeter <reyk@openbsd.org>
@@ -69,7 +69,7 @@ control_run(struct privsep *ps, struct privsep_proc *p, void *arg)
{
/*
* pledge in the control process:
- * stdio - for malloc and basic I/O including events.
+ * stdio - for malloc and basic I/O including events.
* cpath - for managing the control socket.
* unix - for the control socket.
* recvfd - for the proc fd exchange.
diff --git a/usr.sbin/switchd/proc.c b/usr.sbin/switchd/proc.c
index 4f36a83cd42..55ed09e4275 100644
--- a/usr.sbin/switchd/proc.c
+++ b/usr.sbin/switchd/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.10 2017/01/09 14:49:22 reyk Exp $ */
+/* $OpenBSD: proc.c,v 1.11 2017/01/17 22:10:56 krw Exp $ */
/*
* Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -208,7 +208,7 @@ proc_init(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc,
proc_setup(ps, procs, nproc);
/*
- * Create the children sockets so we can use them
+ * Create the children sockets so we can use them
* to distribute the rest of the socketpair()s using
* proc_connect() later.
*/