knf

5 files changed, 15 insertions, 15 deletions

diff --git a/usr.sbin/hoststated/Makefile b/usr.sbin/hoststated/Makefile
index a86139ad266..887740703e2 100644
--- a/usr.sbin/hoststated/Makefile
+++ b/usr.sbin/hoststated/Makefile
@@ -1,13 +1,13 @@
-#	$OpenBSD: Makefile,v 1.8 2007/02/22 03:32:39 reyk Exp $
+#	$OpenBSD: Makefile,v 1.9 2007/02/23 00:28:06 deraadt Exp $
 
 PROG=		hoststated
-SRCS=		parse.y log.c control.c buffer.c imsg.c hoststated.c 	\
-		ssl.c pfe.c pfe_filter.c hce.c 				\
+SRCS=		parse.y log.c control.c buffer.c imsg.c hoststated.c	\
+		ssl.c pfe.c pfe_filter.c hce.c				\
 		check_icmp.c check_tcp.c relay.c carp.c
 MAN=		hoststated.8 hoststated.conf.5
 
 LDADD=		-levent -lssl -lcrypto
-DPADD=		${LIBEVENT} ${LIBSSL} ${LIBCRYPTO} 
+DPADD=		${LIBEVENT} ${LIBSSL} ${LIBCRYPTO}
 CFLAGS+=	-Wall -Werror -I${.CURDIR}
 CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
diff --git a/usr.sbin/hoststated/check_icmp.c b/usr.sbin/hoststated/check_icmp.c
index 8dd77cdeddf..1f2bf1e71e5 100644
--- a/usr.sbin/hoststated/check_icmp.c
+++ b/usr.sbin/hoststated/check_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_icmp.c,v 1.13 2007/02/12 10:39:48 pyr Exp $	*/
+/*	$OpenBSD: check_icmp.c,v 1.14 2007/02/23 00:28:06 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -356,7 +356,7 @@ in_cksum(u_short *addr, int len)
 	}
 
 	/* add back carry outs from top 16 bits to low 16 bits */
-	sum = (sum >> 16) + (sum & 0xffff);     /* add hi 16 to low 16 */
+	sum = (sum >> 16) + (sum & 0xffff);	/* add hi 16 to low 16 */
 	sum += (sum >> 16);			/* add carry */
 	answer = ~sum;				/* truncate to 16 bits */
 
diff --git a/usr.sbin/hoststated/hoststated.c b/usr.sbin/hoststated/hoststated.c
index 3659f914942..22ba0ad6ed3 100644
--- a/usr.sbin/hoststated/hoststated.c
+++ b/usr.sbin/hoststated/hoststated.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hoststated.c,v 1.18 2007/02/22 05:58:06 reyk Exp $	*/
+/*	$OpenBSD: hoststated.c,v 1.19 2007/02/23 00:28:06 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -376,7 +376,7 @@ main_dispatch_pfe(int fd, short event, void *ptr)
 void
 main_dispatch_hce(int fd, short event, void * ptr)
 {
-	struct imsgbuf          *ibuf;
+	struct imsgbuf		*ibuf;
 	struct imsg		 imsg;
 	ssize_t			 n;
 
@@ -416,7 +416,7 @@ main_dispatch_hce(int fd, short event, void * ptr)
 void
 main_dispatch_relay(int fd, short event, void * ptr)
 {
-	struct imsgbuf          *ibuf;
+	struct imsgbuf		*ibuf;
 	struct imsg		 imsg;
 	ssize_t			 n;
 
@@ -607,7 +607,7 @@ expand_string(char *label, size_t len, const char *srch, const char *repl)
 		log_debug("expand_string: string too long");
 		return (-1);
 	}
-	strlcpy(label, tmp, len);       /* always fits */
+	strlcpy(label, tmp, len);	/* always fits */
 	free(tmp);
 
 	return (0);
diff --git a/usr.sbin/hoststated/hoststated.h b/usr.sbin/hoststated/hoststated.h
index 8db90b74a8d..90f9010707a 100644
--- a/usr.sbin/hoststated/hoststated.h
+++ b/usr.sbin/hoststated/hoststated.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hoststated.h,v 1.26 2007/02/22 05:58:06 reyk Exp $	*/
+/*	$OpenBSD: hoststated.h,v 1.27 2007/02/23 00:28:06 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -501,8 +501,8 @@ struct ctl_conn {
 TAILQ_HEAD(ctl_connlist, ctl_conn);
 
 /* control.c */
-int     control_init(void);
-int     control_listen(void);
+int	control_init(void);
+int	control_listen(void);
 void    control_accept(int, short, void *);
 void    control_dispatch_imsg(int, short, void *);
 void	control_imsg_forward(struct imsg *);
diff --git a/usr.sbin/hoststated/pfe.c b/usr.sbin/hoststated/pfe.c
index eb9fc4939f6..e267d2130b9 100644
--- a/usr.sbin/hoststated/pfe.c
+++ b/usr.sbin/hoststated/pfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe.c,v 1.16 2007/02/22 05:58:06 reyk Exp $	*/
+/*	$OpenBSD: pfe.c,v 1.17 2007/02/23 00:28:06 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -318,7 +318,7 @@ pfe_dispatch_parent(int fd, short event, void * ptr)
 void
 pfe_dispatch_relay(int fd, short event, void * ptr)
 {
-	struct imsgbuf          *ibuf;
+	struct imsgbuf		*ibuf;
 	struct imsg		 imsg;
 	ssize_t			 n;
 	struct ctl_natlook	 cnl;