First round of __P removal in sys

1 files changed, 84 insertions, 84 deletions

diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index efe7921eb85..bcef6c26974 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stand.h,v 1.36 2002/03/02 09:31:45 miod Exp $	*/
+/*	$OpenBSD: stand.h,v 1.37 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $	*/
 
 /*-
@@ -68,15 +68,15 @@ struct open_file;
  * independent way.
  */
 struct fs_ops {
-	int	(*open) __P((char *path, struct open_file *f));
-	int	(*close) __P((struct open_file *f));
-	int	(*read) __P((struct open_file *f, void *buf,
-			     size_t size, size_t *resid));
-	int	(*write) __P((struct open_file *f, void *buf,
-			     size_t size, size_t *resid));
-	off_t	(*seek) __P((struct open_file *f, off_t offset, int where));
-	int	(*stat) __P((struct open_file *f, struct stat *sb));
-	int	(*readdir) __P((struct open_file *f, char *));
+	int	(*open)(char *path, struct open_file *f);
+	int	(*close)(struct open_file *f);
+	int	(*read)(struct open_file *f, void *buf,
+			     size_t size, size_t *resid);
+	int	(*write)(struct open_file *f, void *buf,
+			     size_t size, size_t *resid);
+	off_t	(*seek)(struct open_file *f, off_t offset, int where);
+	int	(*stat)(struct open_file *f, struct stat *sb);
+	int	(*readdir)(struct open_file *f, char *);
 };
 
 extern struct fs_ops file_system[];
@@ -90,12 +90,12 @@ extern int nfsys;
 /* Device switch */
 struct devsw {
 	char	*dv_name;
-	int	(*dv_strategy) __P((void *devdata, int rw,
+	int	(*dv_strategy)(void *devdata, int rw,
 				    daddr_t blk, size_t size,
-				    void *buf, size_t *rsize));
-	int	(*dv_open) __P((struct open_file *f, ...));
-	int	(*dv_close) __P((struct open_file *f));
-	int	(*dv_ioctl) __P((struct open_file *f, u_long cmd, void *data));
+				    void *buf, size_t *rsize);
+	int	(*dv_open)(struct open_file *f, ...);
+	int	(*dv_close)(struct open_file *f);
+	int	(*dv_ioctl)(struct open_file *f, u_long cmd, void *data);
 };
 
 extern struct devsw devsw[];	/* device array */
@@ -135,82 +135,82 @@ extern struct open_file files[];
 	h = ((b) % ((nh) * (ns))) / (ns);	\
 	s = ((b) % ((nh) * (ns))) % (ns);
 
-void	*alloc __P((u_int));
-void	*alloca __P((size_t));
-void	free __P((void *, u_int));
+void	*alloc(u_int);
+void	*alloca(size_t);
+void	free(void *, u_int);
 struct	disklabel;
-char	*getdisklabel __P((const char *, struct disklabel *));
-u_int	dkcksum __P((struct disklabel *));
-
-void	printf __P((const char *, ...));
-void	sprintf __P((char *, const char *, ...));
-void	vprintf __P((const char *, _BSD_VA_LIST_));
-void	twiddle __P((void));
-void	gets __P((char *));
-__dead void	panic __P((const char *, ...)) __attribute__((noreturn));
-__dead void	_rtt __P((void)) __attribute__((noreturn));
+char	*getdisklabel(const char *, struct disklabel *);
+u_int	dkcksum(struct disklabel *);
+
+void	printf(const char *, ...);
+void	sprintf(char *, const char *, ...);
+void	vprintf(const char *, _BSD_VA_LIST_);
+void	twiddle(void);
+void	gets(char *);
+__dead void	panic(const char *, ...) __attribute__((noreturn));
+__dead void	_rtt(void) __attribute__((noreturn));
 #define	bzero(s,n)	((void)memset((s),0,(n)))
 #define bcmp(s1,s2,n)	(memcmp((s2),(s1),(n)))
 #define	bcopy(s1,s2,n)	((void)memcpy((s2),(s1),(n)))
-void	*memcpy __P((void *, const void *, size_t));
-int	memcmp __P((const void *, const void*, size_t));
-char	*strncpy __P((char *, const char *, size_t));
-char	*strcpy __P((char *, const char *));
-int	strncmp __P((const char *, const char *, size_t));
-int	strcmp __P((const char *, const char *));
-size_t	strlen __P((const char *));
-long	strtol __P((const char *, char **, int));
-char	*strchr __P((const char *, int));
-void	*memset __P((void *, int, size_t));
-void	exec __P((char *, void *, int));
-void	exit __P((void));
-int	open __P((const char *, int));
-int	close __P((int));
-void	closeall __P((void));
-ssize_t	read __P((int, void *, size_t));
-ssize_t	write __P((int, void *, size_t));
-int	stat __P((const char *path, struct stat *sb));
-int	fstat __P((int fd, struct stat *sb));
-int	opendir __P((char *));
-int	readdir __P((int, char *));
-void	closedir __P((int));
-int	nodev __P((void));
-int	noioctl __P((struct open_file *, u_long, void *));
-void	nullsys __P((void));
-
-int	null_open __P((char *path, struct open_file *f));
-int	null_close __P((struct open_file *f));
-ssize_t	null_read __P((struct open_file *f, void *buf,
-			size_t size, size_t *resid));
-ssize_t	null_write __P((struct open_file *f, void *buf,
-			size_t size, size_t *resid));
-off_t	null_seek __P((struct open_file *f, off_t offset, int where));
-int	null_stat __P((struct open_file *f, struct stat *sb));
-int	null_readdir __P((struct open_file *f, char *name));
-char	*ttyname __P((int)); /* match userland decl, but ignore !0 */
-dev_t	ttydev __P((char *));
-void	cninit __P((void));
-int	cnset __P((dev_t));
-void	cnputc __P((int));
-int	cngetc __P((void));
-int	cnischar __P((void));
-int	cnspeed __P((dev_t, int));
-u_int	sleep __P((u_int));
-void	usleep __P((u_int));
-char *ctime __P((const time_t *));
-
-void	putchar __P((int));    
-int	getchar __P((void));
+void	*memcpy(void *, const void *, size_t);
+int	memcmp(const void *, const void*, size_t);
+char	*strncpy(char *, const char *, size_t);
+char	*strcpy(char *, const char *);
+int	strncmp(const char *, const char *, size_t);
+int	strcmp(const char *, const char *);
+size_t	strlen(const char *);
+long	strtol(const char *, char **, int);
+char	*strchr(const char *, int);
+void	*memset(void *, int, size_t);
+void	exec(char *, void *, int);
+void	exit(void);
+int	open(const char *, int);
+int	close(int);
+void	closeall(void);
+ssize_t	read(int, void *, size_t);
+ssize_t	write(int, void *, size_t);
+int	stat(const char *path, struct stat *sb);
+int	fstat(int fd, struct stat *sb);
+int	opendir(char *);
+int	readdir(int, char *);
+void	closedir(int);
+int	nodev(void);
+int	noioctl(struct open_file *, u_long, void *);
+void	nullsys(void);
+
+int	null_open(char *path, struct open_file *f);
+int	null_close(struct open_file *f);
+ssize_t	null_read(struct open_file *f, void *buf,
+			size_t size, size_t *resid);
+ssize_t	null_write(struct open_file *f, void *buf,
+			size_t size, size_t *resid);
+off_t	null_seek(struct open_file *f, off_t offset, int where);
+int	null_stat(struct open_file *f, struct stat *sb);
+int	null_readdir(struct open_file *f, char *name);
+char	*ttyname(int); /* match userland decl, but ignore !0 */
+dev_t	ttydev(char *);
+void	cninit(void);
+int	cnset(dev_t);
+void	cnputc(int);
+int	cngetc(void);
+int	cnischar(void);
+int	cnspeed(dev_t, int);
+u_int	sleep(u_int);
+void	usleep(u_int);
+char *ctime(const time_t *);
+
+void	putchar(int);    
+int	getchar(void);
 
 #ifdef __INTERNAL_LIBSA_CREAD
-int	oopen __P((const char *, int));
-int	oclose __P((int));
-ssize_t	oread __P((int, void *, size_t));
-off_t	olseek __P((int, off_t, int));
+int	oopen(const char *, int);
+int	oclose(int);
+ssize_t	oread(int, void *, size_t);
+off_t	olseek(int, off_t, int);
 #endif
 
 /* Machine dependent functions */
-int	devopen __P((struct open_file *, const char *, char **));
-void	machdep_start __P((char *, int, char *, char *, char *));
-time_t	getsecs __P((void));
+int	devopen(struct open_file *, const char *, char **);
+void	machdep_start(char *, int, char *, char *, char *);
+time_t	getsecs(void);