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.

1 files changed, 123 insertions, 123 deletions

diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index 9224691cf3d..6b0411ec95e 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.20 2000/06/21 19:22:54 itojun Exp $	*/
+/*	$OpenBSD: extern.h,v 1.21 2002/02/16 21:27:46 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.17 1997/08/18 10:20:19 lukem Exp $	*/
 
 /*
@@ -67,132 +67,132 @@
 
 #include <sys/types.h>
 
-void    abort_remote __P((FILE *));
-void    abortpt __P((int));
-void    abortrecv __P((int));
-void    abortsend __P((int));
-void	account __P((int, char **));
-void	alarmtimer __P((int));
-int	another __P((int *, char ***, const char *));
-int	auto_fetch __P((int, char **, char *));
-void	blkfree __P((char **));
-void	cd __P((int, char **));
-void	cdup __P((int, char **));
-void	changetype __P((int, int));
-void	cmdabort __P((int));
-void	cmdscanner __P((int));
-int	command __P((const char *, ...));
+void    abort_remote(FILE *);
+void    abortpt(int);
+void    abortrecv(int);
+void    abortsend(int);
+void	account(int, char **);
+void	alarmtimer(int);
+int	another(int *, char ***, const char *);
+int	auto_fetch(int, char **, char *);
+void	blkfree(char **);
+void	cd(int, char **);
+void	cdup(int, char **);
+void	changetype(int, int);
+void	cmdabort(int);
+void	cmdscanner(int);
+int	command(const char *, ...);
 #ifndef SMALL
-unsigned char complete __P((EditLine *, int));
-void	controlediting __P((void));
+unsigned char complete(EditLine *, int);
+void	controlediting(void);
 #endif /* !SMALL */
-int	confirm __P((const char *, const char *));
-FILE   *dataconn __P((const char *));
-void	delete __P((int, char **));
-void	disconnect __P((int, char **));
-void	do_chmod __P((int, char **));
-void	do_umask __P((int, char **));
-void	domacro __P((int, char **));
-char   *domap __P((char *));
-void	doproxy __P((int, char **));
-char   *dotrans __P((char *));
-int     empty __P((fd_set *, int));
-int	foregroundproc __P((void));
-void	get __P((int, char **));
-struct cmd *getcmd __P((const char *));
-int	getit __P((int, char **, int, const char *));
-int	getreply __P((int));
-int	globulize __P((char **));
-char   *gunique __P((const char *));
-void	help __P((int, char **));
-char   *hookup __P((char *, char *));
-void	idle __P((int, char **));
-int     initconn __P((void));
-void	intr __P((void));
-int	isurl __P((const char *));
-void	list_vertical __P((StringList *));
-void	lcd __P((int, char **));
-int	login __P((const char *, char *, char *));
-void	lostpeer __P((void));
-void	lpwd __P((int, char **));
-void	ls __P((int, char **));
-void	mabort __P((int));
-void	macdef __P((int, char **));
-void	makeargv __P((void));
-void	makedir __P((int, char **));
-void	mdelete __P((int, char **));
-void	mget __P((int, char **));
-void	mls __P((int, char **));
-void	modtime __P((int, char **));
-void	mput __P((int, char **));
-char   *onoff __P((int));
-void	newer __P((int, char **));
-void	page __P((int, char **));
-void    progressmeter __P((int));
-char   *prompt __P((void));
-void	proxabort __P((int));
-void    proxtrans __P((const char *, const char *, const char *));
-void    psabort __P((int));
-void	psummary __P((int));
-void    pswitch __P((int));
-void    ptransfer __P((int));
-void	put __P((int, char **));
-void	pwd __P((int, char **));
-void	quit __P((int, char **));
-void	quote __P((int, char **));
-void	quote1 __P((const char *, int, char **));
+int	confirm(const char *, const char *);
+FILE   *dataconn(const char *);
+void	delete(int, char **);
+void	disconnect(int, char **);
+void	do_chmod(int, char **);
+void	do_umask(int, char **);
+void	domacro(int, char **);
+char   *domap(char *);
+void	doproxy(int, char **);
+char   *dotrans(char *);
+int     empty(fd_set *, int);
+int	foregroundproc(void);
+void	get(int, char **);
+struct cmd *getcmd(const char *);
+int	getit(int, char **, int, const char *);
+int	getreply(int);
+int	globulize(char **);
+char   *gunique(const char *);
+void	help(int, char **);
+char   *hookup(char *, char *);
+void	idle(int, char **);
+int     initconn(void);
+void	intr(void);
+int	isurl(const char *);
+void	list_vertical(StringList *);
+void	lcd(int, char **);
+int	login(const char *, char *, char *);
+void	lostpeer(void);
+void	lpwd(int, char **);
+void	ls(int, char **);
+void	mabort(int);
+void	macdef(int, char **);
+void	makeargv(void);
+void	makedir(int, char **);
+void	mdelete(int, char **);
+void	mget(int, char **);
+void	mls(int, char **);
+void	modtime(int, char **);
+void	mput(int, char **);
+char   *onoff(int);
+void	newer(int, char **);
+void	page(int, char **);
+void    progressmeter(int);
+char   *prompt(void);
+void	proxabort(int);
+void    proxtrans(const char *, const char *, const char *);
+void    psabort(int);
+void	psummary(int);
+void    pswitch(int);
+void    ptransfer(int);
+void	put(int, char **);
+void	pwd(int, char **);
+void	quit(int, char **);
+void	quote(int, char **);
+void	quote1(const char *, int, char **);
 void    recvrequest __P((const char *, const char *, const char *,
 	    const char *, int, int));
-void	reget __P((int, char **));
-char   *remglob __P((char **, int, char **));
-off_t	remotesize __P((const char *, int));
-time_t	remotemodtime __P((const char *, int));
-void	removedir __P((int, char **));
-void	renamefile __P((int, char **));
-void    reset __P((int, char **));
-void	restart __P((int, char **));
-void	rmthelp __P((int, char **));
-void	rmtstatus __P((int, char **));
-int	ruserpass __P((const char *, char **, char **, char **));
-void    sendrequest __P((const char *, const char *, const char *, int));
-void	setascii __P((int, char **));
-void	setbell __P((int, char **));
-void	setbinary __P((int, char **));
-void	setcase __P((int, char **));
-void	setcr __P((int, char **));
-void	setdebug __P((int, char **));
-void	setedit __P((int, char **));
-void	setepsv4 __P((int, char **));
-void	setform __P((int, char **));
-void	setftmode __P((int, char **));
-void	setgate __P((int, char **));
-void	setglob __P((int, char **));
-void	sethash __P((int, char **));
-void	setnmap __P((int, char **));
-void	setntrans __P((int, char **));
-void	setpassive __P((int, char **));
-void	setpeer __P((int, char **));
-void	setport __P((int, char **));
-void	setpreserve __P((int, char **));
-void	setprogress __P((int, char **));
-void	setprompt __P((int, char **));
-void	setrunique __P((int, char **));
-void	setstruct __P((int, char **));
-void	setsunique __P((int, char **));
-void	settenex __P((int, char **));
-void	settrace __P((int, char **));
-void	setttywidth __P((int));
-void	settype __P((int, char **));
-void	setverbose __P((int, char **));
-void	shell __P((int, char **));
-void	site __P((int, char **));
-void	sizecmd __P((int, char **));
-char   *slurpstring __P((void));
-void	status __P((int, char **));
-void	syst __P((int, char **));
-int	togglevar __P((int, char **, int *, const char *));
-void	usage __P((void));
-void	user __P((int, char **));
+void	reget(int, char **);
+char   *remglob(char **, int, char **);
+off_t	remotesize(const char *, int);
+time_t	remotemodtime(const char *, int);
+void	removedir(int, char **);
+void	renamefile(int, char **);
+void    reset(int, char **);
+void	restart(int, char **);
+void	rmthelp(int, char **);
+void	rmtstatus(int, char **);
+int	ruserpass(const char *, char **, char **, char **);
+void    sendrequest(const char *, const char *, const char *, int);
+void	setascii(int, char **);
+void	setbell(int, char **);
+void	setbinary(int, char **);
+void	setcase(int, char **);
+void	setcr(int, char **);
+void	setdebug(int, char **);
+void	setedit(int, char **);
+void	setepsv4(int, char **);
+void	setform(int, char **);
+void	setftmode(int, char **);
+void	setgate(int, char **);
+void	setglob(int, char **);
+void	sethash(int, char **);
+void	setnmap(int, char **);
+void	setntrans(int, char **);
+void	setpassive(int, char **);
+void	setpeer(int, char **);
+void	setport(int, char **);
+void	setpreserve(int, char **);
+void	setprogress(int, char **);
+void	setprompt(int, char **);
+void	setrunique(int, char **);
+void	setstruct(int, char **);
+void	setsunique(int, char **);
+void	settenex(int, char **);
+void	settrace(int, char **);
+void	setttywidth(int);
+void	settype(int, char **);
+void	setverbose(int, char **);
+void	shell(int, char **);
+void	site(int, char **);
+void	sizecmd(int, char **);
+char   *slurpstring(void);
+void	status(int, char **);
+void	syst(int, char **);
+int	togglevar(int, char **, int *, const char *);
+void	usage(void);
+void	user(int, char **);
 
 
 extern jmp_buf	abortprox;