Fixed some style bugs in the removal of __P(()). The main ones were

not removing tabs before "__P((", and not outdenting continuation lines
to preserve non-KNF lining up of code with parentheses.  Switch to KNF
formatting and/or rewrap the whole prototype in some cases.

6 files changed, 20 insertions, 21 deletions

diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index f8011fb..41b3e96 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -60,13 +60,13 @@ MALLOC_DEFINE(M_SESSION, "session", "session header");
 static MALLOC_DEFINE(M_PROC, "proc", "Proc structures");
 MALLOC_DEFINE(M_SUBPROC, "subproc", "Proc sub-structures");
 
-static struct proc *dopfind	(register pid_t);
+static struct proc *dopfind(register pid_t);
 
-static void doenterpgrp	(struct proc *, struct pgrp *);
+static void doenterpgrp(struct proc *, struct pgrp *);
 
-static void pgdelete	(struct pgrp *);
+static void pgdelete(struct pgrp *);
 
-static void orphanpg	(struct pgrp *pg);
+static void orphanpg(struct pgrp *pg);
 
 /*
  * Other process lists
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 0b06f60..8c75985 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -74,16 +74,16 @@
 
 #define	ONSIG	32		/* NSIG for osig* syscalls.  XXX. */
 
-static int coredump	(struct thread *);
+static int coredump(struct thread *);
 static int do_sigaction(struct proc *p, int sig, struct sigaction *act,
-			     struct sigaction *oact, int old);
+			struct sigaction *oact, int old);
 static int do_sigprocmask(struct proc *p, int how, sigset_t *set,
-			       sigset_t *oset, int old);
+			  sigset_t *oset, int old);
 static char *expand_name(const char *, uid_t, pid_t);
-static int killpg1	(struct proc *cp, int sig, int pgid, int all);
-static int sig_ffs	(sigset_t *set);
-static int sigprop	(int sig);
-static void stop	(struct proc *);
+static int killpg1(struct proc *cp, int sig, int pgid, int all);
+static int sig_ffs(sigset_t *set);
+static int sigprop(int sig);
+static void stop(struct proc *);
 
 static int	filt_sigattach(struct knote *kn);
 static void	filt_sigdetach(struct knote *kn);
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index 75171fe..01628ff 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -48,10 +48,10 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
-static int ttcompatgetflags	(struct tty	*tp);
-static void ttcompatsetflags	(struct tty	*tp, struct termios *t);
-static void ttcompatsetlflags	(struct tty	*tp, struct termios *t);
-static int ttcompatspeedtab	(int speed, struct speedtab *table);
+static int ttcompatgetflags(struct tty *tp);
+static void ttcompatsetflags(struct tty *tp, struct termios *t);
+static void ttcompatsetlflags(struct tty *tp, struct termios *t);
+static int ttcompatspeedtab(int speed, struct speedtab *table);
 
 static int ttydebug = 0;
 SYSCTL_INT(_debug, OID_AUTO, ttydebug, CTLFLAG_RW, &ttydebug, 0, "");
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 4c65827..b4d98d4 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -79,13 +79,13 @@ static void sf_buf_free(caddr_t addr, void *args);
 
 static int sendit(struct thread *td, int s, struct msghdr *mp, int flags);
 static int recvit(struct thread *td, int s, struct msghdr *mp,
-		       caddr_t namelenp);
+		  caddr_t namelenp);
   
 static int accept1(struct thread *td, struct accept_args *uap, int compat);
 static int getsockname1(struct thread *td, struct getsockname_args *uap,
-			     int compat);
+			int compat);
 static int getpeername1(struct thread *td, struct getpeername_args *uap,
-			     int compat);
+			int compat);
 
 /*
  * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 25aecdc..5e24989 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -82,8 +82,7 @@ static ino_t	unp_ino;		/* prototype for fake inode numbers */
 static int     unp_attach(struct socket *);
 static void    unp_detach(struct unpcb *);
 static int     unp_bind(struct unpcb *,struct sockaddr *, struct thread *);
-static int     unp_connect(struct socket *,struct sockaddr *,
-				struct thread *);
+static int     unp_connect(struct socket *,struct sockaddr *, struct thread *);
 static void    unp_disconnect(struct unpcb *);
 static void    unp_shutdown(struct unpcb *);
 static void    unp_drop(struct unpcb *, int);
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 93546ab..f92ee00 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -56,7 +56,7 @@ static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure");
 static void	vfs_free_addrlist(struct netexport *nep);
 static int	vfs_free_netcred(struct radix_node *rn, void *w);
 static int	vfs_hang_addrlist(struct mount *mp, struct netexport *nep,
-				       struct export_args *argp);
+		    struct export_args *argp);
 
 /*
  * Network address lookup element