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.

7 files changed, 55 insertions, 55 deletions

diff --git a/lib/libutil/check_expire.c b/lib/libutil/check_expire.c
index f5689c8b2b9..4f63c09ccfb 100644
--- a/lib/libutil/check_expire.c
+++ b/lib/libutil/check_expire.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_expire.c,v 1.3 2001/08/16 18:39:20 millert Exp $	*/
+/*	$OpenBSD: check_expire.c,v 1.4 2002/02/16 21:27:29 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -51,7 +51,7 @@
 
 #include "util.h"
 
-static char *pwd_update __P((struct passwd *));
+static char *pwd_update(struct passwd *);
 
 int
 login_check_expire(back, pwd, class, lastchance)
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 2c236160ca6..63c4e85121b 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Exp $
+/*	$OpenBSD: fparseln.c,v 1.3 2002/02/16 21:27:29 millert Exp $
 /*	$NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Exp $";
+static char rcsid[] = "$OpenBSD: fparseln.c,v 1.3 2002/02/16 21:27:29 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -42,7 +42,7 @@ static char rcsid[] = "$OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Ex
 
 #include "util.h"
 
-static int isescaped __P((const char *, const char *, int));
+static int isescaped(const char *, const char *, int);
 
 /* isescaped():
  *	Return true if the character in *p that belongs to a string
@@ -192,7 +192,7 @@ fparseln(fp, size, lineno, str, flags)
 
 #ifdef TEST
 
-int main __P((int, char **));
+int main(int, char **);
 
 int
 main(argc, argv)
diff --git a/lib/libutil/login_fbtab.c b/lib/libutil/login_fbtab.c
index 1b9bb526cd4..d32cc0d9c4d 100644
--- a/lib/libutil/login_fbtab.c
+++ b/lib/libutil/login_fbtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_fbtab.c,v 1.7 2001/06/03 15:32:57 deraadt Exp $	*/
+/*	$OpenBSD: login_fbtab.c,v 1.8 2002/02/16 21:27:29 millert Exp $	*/
 
 /************************************************************************
 * Copyright 1995 by Wietse Venema.  All rights reserved.  Some individual
@@ -75,7 +75,7 @@
 
 #define _PATH_FBTAB	"/etc/fbtab"
 
-static void login_protect __P((char *, char *, int, uid_t, gid_t));
+static void login_protect(char *, char *, int, uid_t, gid_t);
 
 #define	WSPACE		" \t\n"
 
diff --git a/lib/libutil/passwd.c b/lib/libutil/passwd.c
index 698407f4873..ceada7f4d91 100644
--- a/lib/libutil/passwd.c
+++ b/lib/libutil/passwd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: passwd.c,v 1.30 2002/01/16 01:28:54 millert Exp $	*/
+/*	$OpenBSD: passwd.c,v 1.31 2002/02/16 21:27:29 millert Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: passwd.c,v 1.30 2002/01/16 01:28:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: passwd.c,v 1.31 2002/02/16 21:27:29 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: passwd.c,v 1.30 2002/01/16 01:28:54 millert Exp
 
 #define NUM_OPTIONS     2       /* Number of hardcoded defaults */
 
-static void	pw_cont __P((int sig));
+static void	pw_cont(int sig);
 
 static const char options[NUM_OPTIONS][2][80] =
 {
diff --git a/lib/libutil/scsi.h b/lib/libutil/scsi.h
index 46ac8cbf73d..08b8a9b9b48 100644
--- a/lib/libutil/scsi.h
+++ b/lib/libutil/scsi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi.h,v 1.1 1996/06/12 11:21:37 deraadt Exp $	*/
+/*	$OpenBSD: scsi.h,v 1.2 2002/02/16 21:27:29 millert Exp $	*/
 
 /* Copyright (c) 1994 HD Associates (hd@world.std.com)
  * All rights reserved.
@@ -50,18 +50,18 @@
 || SR->error       		/* copy of errno */ \
 )
 
-scsireq_t *scsireq_reset __P((scsireq_t *));
-scsireq_t *scsireq_new __P((void));
+scsireq_t *scsireq_reset(scsireq_t *);
+scsireq_t *scsireq_new(void);
 
-int scsireq_buff_decode __P((u_char *, size_t, char *, ...));
+int scsireq_buff_decode(u_char *, size_t, char *, ...);
 int scsireq_buff_decode_visit __P((u_char *, size_t, char *,
 void (*a)(void *, int, void *, int, char *), void *));
 
-int scsireq_decode __P((scsireq_t *, char *, ...));
+int scsireq_decode(scsireq_t *, char *, ...);
 int scsireq_decode_visit __P((scsireq_t *, char *,
 void (*) (void *, int, void *, int, char *), void *));
 
-int scsireq_encode __P((scsireq_t *, char *, ...));
+int scsireq_encode(scsireq_t *, char *, ...);
 int scsireq_encode_visit __P((scsireq_t *, char *,
 	int (*)(void *, char *), void *));
 int scsireq_buff_encode_visit __P((u_char *, size_t, char *,
@@ -75,12 +75,12 @@ scsireq_t *scsireq_build_visit __P((scsireq_t *,
 	u_long, caddr_t, u_long, char *,
 	int (*)(void *, char *), void *));
 
-int scsireq_enter __P((int, scsireq_t *));
+int scsireq_enter(int, scsireq_t *);
 
-void scsi_dump __P((FILE *, char *, u_char *, int, int, int ));
+void scsi_dump(FILE *, char *, u_char *, int, int, int );
 
-int scsi_debug __P((FILE *, int, scsireq_t *));
-FILE *scsi_debug_output __P((char *));
-int scsi_open __P((const char *, int ));
+int scsi_debug(FILE *, int, scsireq_t *);
+FILE *scsi_debug_output(char *);
+int scsi_open(const char *, int );
 
 #endif /* _SCSI_H_ */
diff --git a/lib/libutil/util.h b/lib/libutil/util.h
index bff64ce0367..33bf13560a9 100644
--- a/lib/libutil/util.h
+++ b/lib/libutil/util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.18 2001/09/29 17:45:36 jakob Exp $	*/
+/*	$OpenBSD: util.h,v 1.19 2002/02/16 21:27:29 millert Exp $	*/
 /*	$NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $	*/
 
 /*-
@@ -81,39 +81,39 @@ struct utmp;
 struct winsize;
 
 __BEGIN_DECLS
-char   *fparseln __P((struct __sFILE *, size_t *, size_t *, const char[3], int));
-void	login __P((struct utmp *));
-int	login_tty __P((int));
-int	logout __P((const char *));
-void	logwtmp __P((const char *, const char *, const char *));
-int	opendev __P((char *, int, int, char **));
-int	pidfile __P((const char *));
-void	pw_setdir __P((const char *));
-char   *pw_file __P((const char *));
-int	pw_lock __P((int retries));
-int	pw_mkdb __P((char *, int));
-int	pw_abort __P((void));
-void	pw_init __P((void));
-void	pw_edit __P((int, const char *));
-void	pw_prompt __P((void));
-void	pw_copy __P((int, int, struct passwd *));
-void	pw_getconf __P((char *, size_t, const char *, const char *));
-int	pw_scan __P((char *, struct passwd *, int *));
-void	pw_error __P((const char *, int, int));
+char   *fparseln(struct __sFILE *, size_t *, size_t *, const char[3], int);
+void	login(struct utmp *);
+int	login_tty(int);
+int	logout(const char *);
+void	logwtmp(const char *, const char *, const char *);
+int	opendev(char *, int, int, char **);
+int	pidfile(const char *);
+void	pw_setdir(const char *);
+char   *pw_file(const char *);
+int	pw_lock(int retries);
+int	pw_mkdb(char *, int);
+int	pw_abort(void);
+void	pw_init(void);
+void	pw_edit(int, const char *);
+void	pw_prompt(void);
+void	pw_copy(int, int, struct passwd *);
+void	pw_getconf(char *, size_t, const char *, const char *);
+int	pw_scan(char *, struct passwd *, int *);
+void	pw_error(const char *, int, int);
 int	openpty __P((int *, int *, char *, struct termios *,
 	    struct winsize *));
 int	opendisk __P((const char *path, int flags, char *buf, size_t buflen,
 	    int iscooked));
-pid_t	forkpty __P((int *, char *, struct termios *, struct winsize *));
-int	getmaxpartitions __P((void));
-int	getrawpartition __P((void));
-void	login_fbtab __P((char *, uid_t, gid_t));
-int	login_check_expire __P((struct __sFILE *, struct passwd *, char *, int));
-char   *readlabelfs __P((char *, int));
-const char *uu_lockerr __P((int _uu_lockresult));
-int     uu_lock __P((const char *_ttyname)); 
-int	uu_lock_txfr __P((const char *_ttyname, pid_t _pid));
-int     uu_unlock __P((const char *_ttyname));
+pid_t	forkpty(int *, char *, struct termios *, struct winsize *);
+int	getmaxpartitions(void);
+int	getrawpartition(void);
+void	login_fbtab(char *, uid_t, gid_t);
+int	login_check_expire(struct __sFILE *, struct passwd *, char *, int);
+char   *readlabelfs(char *, int);
+const char *uu_lockerr(int _uu_lockresult);
+int     uu_lock(const char *_ttyname); 
+int	uu_lock_txfr(const char *_ttyname, pid_t _pid);
+int     uu_unlock(const char *_ttyname);
 __END_DECLS
 
 #endif /* !_UTIL_H_ */
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 9c81177e217..0d4c0bba18d 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -1,4 +1,4 @@
-/* * $OpenBSD: uucplock.c,v 1.7 1999/09/21 04:52:46 csapuntz Exp $*/
+/* * $OpenBSD: uucplock.c,v 1.8 2002/02/16 21:27:29 millert Exp $*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -59,8 +59,8 @@ static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
 			    goto __CONCAT(ret, level); }
 
 /* Forward declarations */
-static int put_pid __P((int fd, pid_t pid));
-static pid_t get_pid __P((int fd,int *err));
+static int put_pid(int fd, pid_t pid);
+static pid_t get_pid(int fd,int *err);
 
 /*
  * uucp style locking routines