Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

3 files changed, 17 insertions, 17 deletions

diff --git a/sbin/newlfs/extern.h b/sbin/newlfs/extern.h
index 65ec0cbc77f..b0f100b080b 100644
--- a/sbin/newlfs/extern.h
+++ b/sbin/newlfs/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 1996/07/01 11:02:54 downsj Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.2 1995/03/18 14:58:48 cgd Exp $	*/
 
 /*-
@@ -36,13 +36,13 @@
  *	@(#)extern.h	8.2 (Berkeley) 5/24/95
  */
 
-u_long	cksum __P((void *, size_t));
-u_short	dkcksum __P((struct disklabel *));
-void	fatal __P((const char *fmt, ...));
-u_int	log2 __P((u_int));
+u_long	cksum(void *, size_t);
+u_short	dkcksum(struct disklabel *);
+void	fatal(const char *fmt, ...);
+u_int	log2(u_int);
 int	make_lfs __P((int, struct disklabel *, struct partition *, int,
 		int, int, int));
-int	mkfs __P((struct partition *, char *, int, int));
+int	mkfs(struct partition *, char *, int, int);
 
 extern char	*progname;
 extern char	*special;
diff --git a/sbin/newlfs/lfs.c b/sbin/newlfs/lfs.c
index 7220287491c..42c7f9abd40 100644
--- a/sbin/newlfs/lfs.c
+++ b/sbin/newlfs/lfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs.c,v 1.4 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: lfs.c,v 1.5 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: lfs.c,v 1.8 1995/06/19 21:30:36 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)lfs.c	8.5 (Berkeley) 5/24/95";
 #else
-static char rcsid[] = "$OpenBSD: lfs.c,v 1.4 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: lfs.c,v 1.5 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -168,9 +168,9 @@ struct direct lfs_lf_dir[] = {
 };
 
 static daddr_t make_dinode 
-	__P((ino_t, struct dinode *, int, daddr_t, struct lfs *));
-static void make_dir __P(( void *, struct direct *, int));
-static void put __P((int, off_t, void *, size_t));
+(ino_t, struct dinode *, int, daddr_t, struct lfs *);
+static void make_dir( void *, struct direct *, int);
+static void put(int, off_t, void *, size_t);
 
 int
 make_lfs(fd, lp, partp, minfree, block_size, frag_size, seg_size)
diff --git a/sbin/newlfs/newfs.c b/sbin/newlfs/newfs.c
index f41d4101ca5..db9881658fa 100644
--- a/sbin/newlfs/newfs.c
+++ b/sbin/newlfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.8 1999/08/17 09:13:14 millert Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.9 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: newfs.c,v 1.5 1996/05/16 07:17:50 thorpej Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.5 (Berkeley) 5/24/95";
 #else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.8 1999/08/17 09:13:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.9 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -118,10 +118,10 @@ int	unlabeled;
 char	device[MAXPATHLEN];
 char	*progname, *special;
 
-static struct disklabel *getdisklabel __P((char *, int));
-static struct disklabel *debug_readlabel __P((int));
-static void rewritelabel __P((char *, int, struct disklabel *));
-static void usage __P((void));
+static struct disklabel *getdisklabel(char *, int);
+static struct disklabel *debug_readlabel(int);
+static void rewritelabel(char *, int, struct disklabel *);
+static void usage(void);
 
 int
 main(argc, argv)