space cleanup; ok eric

13 files changed, 72 insertions, 72 deletions

diff --git a/lib/libc/asr/asr.c b/lib/libc/asr/asr.c
index 5e4e0e15d06..b9c3dc1fbed 100644
--- a/lib/libc/asr/asr.c
+++ b/lib/libc/asr/asr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr.c,v 1.18 2013/03/31 19:42:10 eric Exp $	*/
+/*	$OpenBSD: asr.c,v 1.19 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2010-2012 Eric Faurot <eric@openbsd.org>
  *
@@ -443,7 +443,7 @@ asr_check_reload(struct asr *asr)
 	asr->a_ctx = ac;
 }
 
-/* 
+/*
  * Construct a fully-qualified domain name for the given name and domain.
  * If "name" ends with a '.' it is considered as a FQDN by itself.
  * Otherwise, the domain, which must be a FQDN, is appended to "name" (it
@@ -510,7 +510,7 @@ asr_ndots(const char *s)
 	return (n);
 }
 
-/* 
+/*
  * Allocate a new empty context.
  */
 static struct asr_ctx *
@@ -590,7 +590,7 @@ pass0(char **tok, int n, struct asr_ctx *ac)
 			return;
 		if (n != 2)
 			return;
-		if (asr_parse_nameserver((struct sockaddr*)&ss, tok[1]))
+		if (asr_parse_nameserver((struct sockaddr *)&ss, tok[1]))
 			return;
 		if ((ac->ac_ns[ac->ac_nscount] = calloc(1, ss.ss_len)) == NULL)
 			return;
@@ -799,7 +799,7 @@ asr_ctx_envopts(struct asr_ctx *ac)
 
 /*
  * Parse a resolv.conf(5) nameserver string into a sockaddr.
- */ 
+ */
 static int
 asr_parse_nameserver(struct sockaddr *sa, const char *s)
 {
@@ -842,7 +842,7 @@ asr_parse_nameserver(struct sockaddr *sa, const char *s)
  * where labels are separated by dots. The result is put into the "buf" buffer,
  * truncated if it exceeds "max" chars. The function returns "buf".
  */
-char*
+char *
 asr_strdname(const char *_dname, char *buf, size_t max)
 {
 	const unsigned char *dname = _dname;
diff --git a/lib/libc/asr/asr.h b/lib/libc/asr/asr.h
index da1f2cf2959..8f9f11729c6 100644
--- a/lib/libc/asr/asr.h
+++ b/lib/libc/asr/asr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr.h,v 1.4 2012/11/24 15:12:48 eric Exp $	*/
+/*	$OpenBSD: asr.h,v 1.5 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -75,8 +75,8 @@ void async_abort(struct async *);
 /* This opaque structure holds an async resolver context. */
 struct asr;
 
-struct asr *async_resolver(const char*);
-void	    async_resolver_done(struct asr*);
+struct asr *async_resolver(const char *);
+void	    async_resolver_done(struct asr *);
 
 /* Async version of the resolver API */
 
diff --git a/lib/libc/asr/asr_debug.c b/lib/libc/asr/asr_debug.c
index 3c50eeafd86..eeed6a710f3 100644
--- a/lib/libc/asr/asr_debug.c
+++ b/lib/libc/asr/asr_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr_debug.c,v 1.10 2012/11/24 15:12:48 eric Exp $	*/
+/*	$OpenBSD: asr_debug.c,v 1.11 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -26,11 +26,11 @@
 #include "asr.h"
 #include "asr_private.h"
 
-static const char* rcodetostr(uint16_t);
-static const char* print_dname(const char *, char *, size_t);
-static const char* print_header(const struct header *, char *, size_t);
-static const char* print_query(const struct query *, char *, size_t);
-static const char* print_rr(const struct rr*, char *, size_t);
+static const char *rcodetostr(uint16_t);
+static const char *print_dname(const char *, char *, size_t);
+static const char *print_header(const struct header *, char *, size_t);
+static const char *print_query(const struct query *, char *, size_t);
+static const char *print_rr(const struct rr *, char *, size_t);
 
 FILE *asr_debug = NULL;
 
@@ -51,13 +51,13 @@ rcodetostr(uint16_t v)
 	}
 }
 
-static const char*
+static const char *
 print_dname(const char *_dname, char *buf, size_t max)
 {
 	return (asr_strdname(_dname, buf, max));
 }
 
-static const char*
+static const char *
 print_rr(const struct rr *rr, char *buf, size_t max)
 {
 	char	*res;
@@ -129,7 +129,7 @@ print_rr(const struct rr *rr, char *buf, size_t max)
 	return (res);
 }
 
-static const char*
+static const char *
 print_query(const struct query *q, char *buf, size_t max)
 {
 	char b[256];
@@ -141,7 +141,7 @@ print_query(const struct query *q, char *buf, size_t max)
 	return (buf);
 }
 
-static const char*
+static const char *
 print_header(const struct header *h, char *buf, size_t max)
 {
 	snprintf(buf, max,
diff --git a/lib/libc/asr/asr_private.h b/lib/libc/asr/asr_private.h
index 6690f1ddcd3..a28f0db30af 100644
--- a/lib/libc/asr/asr_private.h
+++ b/lib/libc/asr/asr_private.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr_private.h,v 1.13 2013/04/01 08:54:06 eric Exp $	*/
+/*	$OpenBSD: asr_private.h,v 1.14 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -305,15 +305,15 @@ enum asr_state {
 
 /* asr_utils.c */
 void	pack_init(struct pack *, char *, size_t);
-int	pack_header(struct pack*, const struct header*);
-int	pack_query(struct pack*, uint16_t, uint16_t, const char*);
+int	pack_header(struct pack *, const struct header *);
+int	pack_query(struct pack *, uint16_t, uint16_t, const char *);
 
 void	unpack_init(struct unpack *, const char *, size_t);
-int	unpack_header(struct unpack*, struct header*);
-int	unpack_query(struct unpack*, struct query*);
-int	unpack_rr(struct unpack*, struct rr*);
+int	unpack_header(struct unpack *, struct header *);
+int	unpack_query(struct unpack *, struct query*);
+int	unpack_rr(struct unpack *, struct rr *);
 int	sockaddr_from_str(struct sockaddr *, int, const char *);
-ssize_t dname_from_fqdn(const char*, char*, size_t);
+ssize_t dname_from_fqdn(const char *, char *, size_t);
 
 /* asr.c */
 struct asr_ctx *asr_use_resolver(struct asr *);
diff --git a/lib/libc/asr/asr_utils.c b/lib/libc/asr/asr_utils.c
index de1e3b45db2..41112550b04 100644
--- a/lib/libc/asr/asr_utils.c
+++ b/lib/libc/asr/asr_utils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr_utils.c,v 1.4 2013/03/29 23:01:24 eric Exp $	*/
+/*	$OpenBSD: asr_utils.c,v 1.5 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2009-2012	Eric Faurot	<eric@faurot.net>
  *
@@ -33,20 +33,20 @@
 #include "asr.h"
 #include "asr_private.h"
 
-static int dname_check_label(const char*, size_t);
-static ssize_t dname_expand(const unsigned char*, size_t, size_t, size_t*,
+static int dname_check_label(const char *, size_t);
+static ssize_t dname_expand(const unsigned char *, size_t, size_t, size_t *,
     char *, size_t);
 
-static int unpack_data(struct unpack*, void*, size_t);
-static int unpack_u16(struct unpack*, uint16_t*);
-static int unpack_u32(struct unpack*, uint32_t*);
-static int unpack_inaddr(struct unpack*, struct in_addr*);
-static int unpack_in6addr(struct unpack*, struct in6_addr*);
-static int unpack_dname(struct unpack*, char*, size_t);
+static int unpack_data(struct unpack *, void *, size_t);
+static int unpack_u16(struct unpack *, uint16_t *);
+static int unpack_u32(struct unpack *, uint32_t *);
+static int unpack_inaddr(struct unpack *, struct in_addr *);
+static int unpack_in6addr(struct unpack *, struct in6_addr *);
+static int unpack_dname(struct unpack *, char *, size_t);
 
-static int pack_data(struct pack*, const void*, size_t);
-static int pack_u16(struct pack*, uint16_t);
-static int pack_dname(struct pack*, const char*);
+static int pack_data(struct pack *, const void *, size_t);
+static int pack_u16(struct pack *, uint16_t);
+static int pack_dname(struct pack *, const char *);
 
 static int
 dname_check_label(const char *s, size_t l)
diff --git a/lib/libc/asr/async_resolver.3 b/lib/libc/asr/async_resolver.3
index b750e382ca4..38f71f4ca81 100644
--- a/lib/libc/asr/async_resolver.3
+++ b/lib/libc/asr/async_resolver.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: async_resolver.3,v 1.9 2013/03/30 20:00:08 eric Exp $
+.\"	$OpenBSD: async_resolver.3,v 1.10 2013/04/01 15:49:54 deraadt Exp $
 .\"
 .\" Copyright (c) 2012, Eric Faurot <eric@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 30 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt ASYN_RESOLVER 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nd asynchronous resolver functions
 .Sh SYNOPSIS
 .Fd #include <asr.h>
-.Ft struct asr*
+.Ft struct asr *
 .Fn async_resolver "const char *conf"
 .Ft void
 .Fn async_resolver_done "struct asr *asr"
@@ -48,25 +48,25 @@
 .Fn async_run_sync "struct async *as" "struct async_res *ar"
 .Ft void
 .Fn async_abort "struct async *as"
-.Ft struct async*
+.Ft struct async *
 .Fn res_send_async "const unsigned char *pkt" "int pktlen" "unsigned char *ans" "int anslen" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn res_query_async "const char *name" "int class" "int type" "unsigned char *ans" "int anslen" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn getrrsetbyname_async "const char *hostname" "unsigned int rdclass" "unsigned int rdtype" "unsigned int flags" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn gethostbyname_async "const char *name" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn gethostbyname2_async "const char *name" "int af" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn gethostbyaddr_async "const void *addr" "socklen_t len" "int af" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn getnetbyname_async "const char *name" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn getnetbyaddr_async "in_addr_t net" "int type" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn getaddrinfo_async "const char *hostname" "const char *servname" "const struct addrinfo *hints" "struct asr *asr"
-.Ft struct async*
+.Ft struct async *
 .Fn getnameinfo_async "const struct sockaddr *sa" "socklen_t salen" "char *host" "size_t hostlen" "char *serv" "size_t servlen" "int flags" "struct asr *asr"
 .Sh DESCRIPTION
 The
diff --git a/lib/libc/asr/getaddrinfo_async.c b/lib/libc/asr/getaddrinfo_async.c
index 742603a2ef2..923702f7f67 100644
--- a/lib/libc/asr/getaddrinfo_async.c
+++ b/lib/libc/asr/getaddrinfo_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getaddrinfo_async.c,v 1.13 2013/03/30 20:11:19 eric Exp $	*/
+/*	$OpenBSD: getaddrinfo_async.c,v 1.14 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -433,7 +433,7 @@ get_port(const char *servname, const char *proto, int numonly)
 	struct servent		se;
 	struct servent_data	sed;
 	int			port, r;
-	const char*		e;
+	const char		*e;
 
 	if (servname == NULL)
 		return (0);
@@ -519,7 +519,7 @@ addrinfo_add(struct async *as, const struct sockaddr *sa, const char *cname)
 		ai->ai_socktype = matches[i].socktype;
 		ai->ai_protocol = proto;
 		ai->ai_addrlen = sa->sa_len;
-		ai->ai_addr = (void*)(ai + 1);
+		ai->ai_addr = (void *)(ai + 1);
 		if (cname &&
 		    as->as.ai.hints.ai_flags & (AI_CANONNAME | AI_FQDN)) {
 			if ((ai->ai_canonname = strdup(cname)) == NULL) {
diff --git a/lib/libc/asr/gethostnamadr.c b/lib/libc/asr/gethostnamadr.c
index ae4beadb0b8..1ed1dcf460c 100644
--- a/lib/libc/asr/gethostnamadr.c
+++ b/lib/libc/asr/gethostnamadr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gethostnamadr.c,v 1.3 2013/04/01 07:47:26 eric Exp $	*/
+/*	$OpenBSD: gethostnamadr.c,v 1.4 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -27,7 +27,7 @@
 #include "asr.h"
 
 #define PALIGN(p, l) \
-	((char*)(p) + (((uintptr_t)(p) % (l)) ? \
+	((char *)(p) + (((uintptr_t)(p) % (l)) ? \
                 (l) - (uintptr_t)(p) % (l) : 0))
 
 static struct hostent *_gethostbyname(const char *, int);
@@ -52,9 +52,9 @@ _fillhostent(const struct hostent *h, struct hostent *r, char *buf, size_t len)
 	r->h_addr_list = _empty;
 
 	end = buf + len;
-	ptr = (char**)PALIGN(buf, sizeof(char*));
+	ptr = (char **)PALIGN(buf, sizeof(char *));
 
-	if ((char*)ptr >= end)
+	if ((char *)ptr >= end)
 		return;
 
 	for (naliases = 0; h->h_aliases[naliases]; naliases++)
@@ -62,7 +62,7 @@ _fillhostent(const struct hostent *h, struct hostent *r, char *buf, size_t len)
 	for (naddrs = 0; h->h_addr_list[naddrs]; naddrs++)
 		;
 
-	pos = (char*)(ptr + (naliases + 1) + (naddrs + 1));
+	pos = (char *)(ptr + (naliases + 1) + (naddrs + 1));
 	if (pos >= end)
 		return;
 
diff --git a/lib/libc/asr/gethostnamadr_async.c b/lib/libc/asr/gethostnamadr_async.c
index 625b236b74b..e819ea56f6e 100644
--- a/lib/libc/asr/gethostnamadr_async.c
+++ b/lib/libc/asr/gethostnamadr_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gethostnamadr_async.c,v 1.15 2013/04/01 08:54:07 eric Exp $	*/
+/*	$OpenBSD: gethostnamadr_async.c,v 1.16 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -538,7 +538,7 @@ hostent_alloc(int family)
 	h->h.h_length = (family == AF_INET) ? 4 : 16;
 	h->h.h_aliases = h->aliases;
 	h->h.h_addr_list = h->addrs;
-	h->pos = (char*)(h) + sizeof(*h);
+	h->pos = (char *)(h) + sizeof(*h);
 	h->end = h->pos + 1024;
 
 	return (h);
diff --git a/lib/libc/asr/getnetnamadr.c b/lib/libc/asr/getnetnamadr.c
index 58a297d681c..092363d1b9a 100644
--- a/lib/libc/asr/getnetnamadr.c
+++ b/lib/libc/asr/getnetnamadr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetnamadr.c,v 1.2 2012/11/24 15:12:48 eric Exp $	*/
+/*	$OpenBSD: getnetnamadr.c,v 1.3 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -41,7 +41,7 @@ _fillnetent(const struct netent *e, struct netent *r, char *buf, size_t len)
 	int	naliases;
 
 	end = buf + len;
-	ptr = (char**)buf; /* XXX align */
+	ptr = (char **)buf; /* XXX align */
 
 	for (naliases = 0; e->n_aliases[naliases]; naliases++)
 		;
diff --git a/lib/libc/asr/getnetnamadr_async.c b/lib/libc/asr/getnetnamadr_async.c
index 8c045c764cf..644ba66ca0e 100644
--- a/lib/libc/asr/getnetnamadr_async.c
+++ b/lib/libc/asr/getnetnamadr_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetnamadr_async.c,v 1.7 2012/11/24 18:58:49 eric Exp $	*/
+/*	$OpenBSD: getnetnamadr_async.c,v 1.8 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -154,7 +154,7 @@ getnetnamadr_async_run(struct async *as, struct async_res *ar)
 				name = dname;
 
 				in = htonl(as->as.netnamadr.addr);
-				addr_as_fqdn((char*)&in,
+				addr_as_fqdn((char *)&in,
 				    as->as.netnamadr.family,
 				    dname, sizeof(dname));
 				as->as.netnamadr.subq = res_query_async_ctx(
@@ -177,7 +177,7 @@ getnetnamadr_async_run(struct async *as, struct async_res *ar)
 			if (as->as_type == ASR_GETNETBYNAME)
 				data = as->as.netnamadr.name;
 			else
-				data = (void*)&as->as.netnamadr.addr;
+				data = (void *)&as->as.netnamadr.addr;
 
 			n = netent_file_match(f, as->as_type, data);
 			saved_errno = errno;
@@ -384,7 +384,7 @@ netent_alloc(int family)
 
 	n->n.n_addrtype = family;
 	n->n.n_aliases = n->aliases;
-	n->pos = (char*)(n) + sizeof(*n);
+	n->pos = (char *)(n) + sizeof(*n);
 	n->end = n->pos + 1024;
 
 	return (n);
diff --git a/lib/libc/asr/res_search_async.c b/lib/libc/asr/res_search_async.c
index 5310a106263..a00defc5ac5 100644
--- a/lib/libc/asr/res_search_async.c
+++ b/lib/libc/asr/res_search_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_search_async.c,v 1.4 2013/03/27 07:40:41 eric Exp $	*/
+/*	$OpenBSD: res_search_async.c,v 1.5 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <unistd.h>
 
-/* 
+/*
  * TODO:
  *
  * - make it possible to reuse ibuf if it was NULL when first called,
@@ -200,7 +200,7 @@ res_search_async_run(struct async *as, struct async_res *ar)
 			ar->ar_h_errno = NO_DATA;
 		else if (as->as.search.flags & ASYNC_AGAIN)
 			ar->ar_h_errno = TRY_AGAIN;
-		/* 
+		/*
 		 * Else, we got the ar_h_errno value set by res_query_async()
 		 * for the last domain.
 		 */
diff --git a/lib/libc/asr/res_send_async.c b/lib/libc/asr/res_send_async.c
index 21646c34d3f..7d85f51ad3f 100644
--- a/lib/libc/asr/res_send_async.c
+++ b/lib/libc/asr/res_send_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_send_async.c,v 1.9 2013/04/01 07:52:06 eric Exp $	*/
+/*	$OpenBSD: res_send_async.c,v 1.10 2013/04/01 15:49:54 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -78,7 +78,7 @@ res_send_async(const unsigned char *buf, int buflen, unsigned char *ans,
 	}
 
 	as->as.dns.flags |= ASYNC_EXTOBUF;
-	as->as.dns.obuf = (unsigned char*)buf;
+	as->as.dns.obuf = (unsigned char *)buf;
 	as->as.dns.obuflen = buflen;
 	as->as.dns.obufsize = buflen;