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, 72 insertions, 72 deletions

diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 134906612e3..8582ba184dc 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 1997/07/05 20:51:21 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.4 1995/03/18 14:59:43 cgd Exp $	*/
 
 /*-
@@ -36,78 +36,78 @@
  *	@(#)extern.h	8.2 (Berkeley) 1/7/94
  */
 
-struct entry	*addentry __P((char *, ino_t, int));
-long		 addfile __P((char *, ino_t, int));
-int		 addwhiteout __P((char *));
-void		 badentry __P((struct entry *, char *));
-void	 	 canon __P((char *, char *));
-void		 checkrestore __P((void));
-void 		 cleanup __P((void));
-void		 closemt __P((void));
-void		 createfiles __P((void));
-void		 createleaves __P((char *));
-void		 createlinks __P((void));
-long		 deletefile __P((char *, ino_t, int));
-void		 deleteino __P((ino_t));
-void		 delwhiteout __P((struct entry *));
-ino_t		 dirlookup __P((const char *));
-void		 dumpsymtable __P((char *, long));
-void	 	 extractdirs __P((int));
-int		 extractfile __P((char *));
-void		 findunreflinks __P((void));
-char		*flagvalues __P((struct entry *));
-void		 freeentry __P((struct entry *));
-void		 freename __P((char *));
-int	 	 genliteraldir __P((char *, ino_t));
-char		*gentempname __P((struct entry *));
+struct entry	*addentry(char *, ino_t, int);
+long		 addfile(char *, ino_t, int);
+int		 addwhiteout(char *);
+void		 badentry(struct entry *, char *);
+void	 	 canon(char *, char *);
+void		 checkrestore(void);
+void 		 cleanup(void);
+void		 closemt(void);
+void		 createfiles(void);
+void		 createleaves(char *);
+void		 createlinks(void);
+long		 deletefile(char *, ino_t, int);
+void		 deleteino(ino_t);
+void		 delwhiteout(struct entry *);
+ino_t		 dirlookup(const char *);
+void		 dumpsymtable(char *, long);
+void	 	 extractdirs(int);
+int		 extractfile(char *);
+void		 findunreflinks(void);
+char		*flagvalues(struct entry *);
+void		 freeentry(struct entry *);
+void		 freename(char *);
+int	 	 genliteraldir(char *, ino_t);
+char		*gentempname(struct entry *);
 void		 getfile __P((void (*)(char *, long), void (*)(char *, long)));
-void		 getvol __P((long));
-void		 initsymtable __P((char *));
-int	 	 inodetype __P((ino_t));
-int		 linkit __P((char *, char *, int));
-struct entry	*lookupino __P((ino_t));
-struct entry	*lookupname __P((char *));
-long		 listfile __P((char *, ino_t, int));
-ino_t		 lowerbnd __P((ino_t));
-void		 mktempname __P((struct entry *));
-void		 moveentry __P((struct entry *, char *));
-void		 msg __P((const char *, ...));
-char		*myname __P((struct entry *));
-void		 newnode __P((struct entry *));
-void		 newtapebuf __P((long));
-long		 nodeupdates __P((char *, ino_t, int));
-void	 	 onintr __P((int));
-void		 panic __P((const char *, ...));
-void		 pathcheck __P((char *));
-struct direct	*pathsearch __P((const char *));
-void		 printdumpinfo __P((void));
-void		 removeleaf __P((struct entry *));
-void		 removenode __P((struct entry *));
-void		 removeoldleaves __P((void));
-void		 removeoldnodes __P((void));
-void		 renameit __P((char *, char *));
-int		 reply __P((char *));
-RST_DIR		*rst_opendir __P((const char *));
-struct direct	*rst_readdir __P((RST_DIR *));
-void		 rst_closedir __P((RST_DIR *dirp));
-void	 	 runcmdshell __P((void));
-char		*savename __P((char *));
-void	 	 setdirmodes __P((int));
-void		 setinput __P((char *));
-void		 setup __P((void));
-void	 	 skipdirs __P((void));
-void		 skipfile __P((void));
-void		 skipmaps __P((void));
-void		 swabst __P((u_char *, u_char *));
+void		 getvol(long);
+void		 initsymtable(char *);
+int	 	 inodetype(ino_t);
+int		 linkit(char *, char *, int);
+struct entry	*lookupino(ino_t);
+struct entry	*lookupname(char *);
+long		 listfile(char *, ino_t, int);
+ino_t		 lowerbnd(ino_t);
+void		 mktempname(struct entry *);
+void		 moveentry(struct entry *, char *);
+void		 msg(const char *, ...);
+char		*myname(struct entry *);
+void		 newnode(struct entry *);
+void		 newtapebuf(long);
+long		 nodeupdates(char *, ino_t, int);
+void	 	 onintr(int);
+void		 panic(const char *, ...);
+void		 pathcheck(char *);
+struct direct	*pathsearch(const char *);
+void		 printdumpinfo(void);
+void		 removeleaf(struct entry *);
+void		 removenode(struct entry *);
+void		 removeoldleaves(void);
+void		 removeoldnodes(void);
+void		 renameit(char *, char *);
+int		 reply(char *);
+RST_DIR		*rst_opendir(const char *);
+struct direct	*rst_readdir(RST_DIR *);
+void		 rst_closedir(RST_DIR *dirp);
+void	 	 runcmdshell(void);
+char		*savename(char *);
+void	 	 setdirmodes(int);
+void		 setinput(char *);
+void		 setup(void);
+void	 	 skipdirs(void);
+void		 skipfile(void);
+void		 skipmaps(void);
+void		 swabst(u_char *, u_char *);
 void	 	 treescan __P((char *, ino_t, long (*)(char *, ino_t, int)));
-ino_t		 upperbnd __P((ino_t));
-long		 verifyfile __P((char *, ino_t, int));
-void		 xtrnull __P((char *, long));
+ino_t		 upperbnd(ino_t);
+long		 verifyfile(char *, ino_t, int);
+void		 xtrnull(char *, long);
 
 /* From ../dump/dumprmt.c */
-void		rmtclose __P((void));
-int		rmthost __P((char *));
-int		rmtioctl __P((int, int));
-int		rmtopen __P((char *, int));
-int		rmtread __P((char *, int));
-int		rmtseek __P((int, int));
+void		rmtclose(void);
+int		rmthost(char *);
+int		rmtioctl(int, int);
+int		rmtopen(char *, int);
+int		rmtread(char *, int);
+int		rmtseek(int, int);