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

diff --git a/libexec/ld.so/alpha/archdep.h b/libexec/ld.so/alpha/archdep.h
index 96a2f3f2163..c599ab776b6 100644
--- a/libexec/ld.so/alpha/archdep.h
+++ b/libexec/ld.so/alpha/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.3 2001/06/08 06:52:32 art Exp $ */
+/*	$OpenBSD: archdep.h,v 1.4 2002/02/16 21:27:30 millert Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -45,7 +45,7 @@
 #include <elf_abi.h>
 #include <machine/reloc.h>
 
-int	_dl_write __P((int, const char *, int));
+int	_dl_write(int, const char *, int);
 
 /*
  *	The following functions are declared inline so they can
diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h
index 02ddf74ff33..367579f6bec 100644
--- a/libexec/ld.so/alpha/syscall.h
+++ b/libexec/ld.so/alpha/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.1 2001/05/14 22:18:22 niklas Exp $ */
+/*	$OpenBSD: syscall.h,v 1.2 2002/02/16 21:27:30 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -42,23 +42,23 @@
 #define _dl_check_error(__res) \
     ((int) __res < 0 && (int) __res >= -_dl_MAX_ERRNO)
 
-int	_dl_close __P((int));
-int	_dl_exit __P((int));
-int	_dl_getegid __P((void));
-int	_dl_geteuid __P((void));
-int	_dl_getgid __P((void));
-int	_dl_getuid __P((void));
+int	_dl_close(int);
+int	_dl_exit(int);
+int	_dl_getegid(void);
+int	_dl_geteuid(void);
+int	_dl_getgid(void);
+int	_dl_getuid(void);
 long	_dl_mmap __P((void *, unsigned int, unsigned int, unsigned int, int,
 		      off_t));
-int	_dl_mprotect __P((const void *, int, int));
-int	_dl_munmap __P((const void*, unsigned int));
-int	_dl_open __P((const char*, unsigned int));
-void	_dl_printf __P((const char *, ...));
-int	_dl_read __P((int, const char*, int));
+int	_dl_mprotect(const void *, int, int);
+int	_dl_munmap(const void*, unsigned int);
+int	_dl_open(const char*, unsigned int);
+void	_dl_printf(const char *, ...);
+int	_dl_read(int, const char*, int);
 #ifdef USE_CACHE
-int	_dl_stat __P((const char *, struct stat *));
+int	_dl_stat(const char *, struct stat *);
 #endif
-int	_dl_write __P((int, const char*, int));
+int	_dl_write(int, const char*, int);
 
 /*
  * Not an actual syscall, but we need something in assembly to say
diff --git a/libexec/ld.so/dl_printf.c b/libexec/ld.so/dl_printf.c
index 1e0f3fa6531..db3e38d479b 100644
--- a/libexec/ld.so/dl_printf.c
+++ b/libexec/ld.so/dl_printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl_printf.c,v 1.2 2001/06/06 12:38:44 art Exp $	*/
+/*	$OpenBSD: dl_printf.c,v 1.3 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -70,8 +70,8 @@
 static void kprintn __P((void (*)(int), u_long, int));
 static void kdoprnt __P((void (*)(int), const char *, va_list));
 
-static void putchar __P((int));
-static void sputchar __P((int));
+static void putchar(int);
+static void sputchar(int);
 static char *sbuf;
 
 static void
diff --git a/libexec/ld.so/ldconfig/ld.h b/libexec/ld.so/ldconfig/ld.h
index cb00ad572fa..d9b9be014d8 100644
--- a/libexec/ld.so/ldconfig/ld.h
+++ b/libexec/ld.so/ldconfig/ld.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.h,v 1.3 2001/01/30 02:39:04 brad Exp $ */
+/* $OpenBSD: ld.h,v 1.4 2002/02/16 21:27:30 millert Exp $ */
 /*
  * Header file to make code compatible with ELF version 
  * ldconfig was taken from the a.out ld.
@@ -7,9 +7,9 @@
 
 extern int	n_search_dirs;
 extern char	**search_dirs;
-char	*xstrdup __P((char *));
-void	*xmalloc __P((size_t));
-void	*xrealloc __P((void *, size_t));
-char	*concat __P((const char *, const char *, const char *));
+char	*xstrdup(char *);
+void	*xmalloc(size_t);
+void	*xrealloc(void *, size_t);
+char	*concat(const char *, const char *, const char *);
 
 #define PAGSIZ	__LDPGSZ
diff --git a/libexec/ld.so/ldconfig/ldconfig.c b/libexec/ld.so/ldconfig/ldconfig.c
index 70cd9906a2e..2442752b2fe 100644
--- a/libexec/ld.so/ldconfig/ldconfig.c
+++ b/libexec/ld.so/ldconfig/ldconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldconfig.c,v 1.6 2001/12/07 18:45:32 mpech Exp $	*/
+/*	$OpenBSD: ldconfig.c,v 1.7 2002/02/16 21:27:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1993,1995 Paul Kranenburg
@@ -79,11 +79,11 @@ struct shlib_list {
 static struct shlib_list	*shlib_head = NULL, **shlib_tail = &shlib_head;
 static char			*dir_list;
 
-static void	enter __P((char *, char *, char *, int *, int));
-static int	dodir __P((char *, int));
-static int	buildhints __P((void));
-static int	readhints __P((void));
-static void	listhints __P((void));
+static void	enter(char *, char *, char *, int *, int);
+static int	dodir(char *, int);
+static int	buildhints(void);
+static int	readhints(void);
+static void	listhints(void);
 
 int
 main(argc, argv)
diff --git a/libexec/ld.so/sparc64/archdep.h b/libexec/ld.so/sparc64/archdep.h
index 3ddd8b3c92c..cd2ea9b3abe 100644
--- a/libexec/ld.so/sparc64/archdep.h
+++ b/libexec/ld.so/sparc64/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.4 2001/09/25 06:57:03 art Exp $ */
+/*	$OpenBSD: archdep.h,v 1.5 2002/02/16 21:27:30 millert Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -47,7 +47,7 @@
 #include <machine/reloc.h>
 #include <sys/syscall.h>
 
-int	_dl_write __P((int, const char *, int));
+int	_dl_write(int, const char *, int);
 
 /*
  *	The following functions are declared inline so they can
diff --git a/libexec/ld.so/sparc64/syscall.h b/libexec/ld.so/sparc64/syscall.h
index 52d6f7a85b3..9233615d393 100644
--- a/libexec/ld.so/sparc64/syscall.h
+++ b/libexec/ld.so/sparc64/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.2 2001/09/25 06:57:03 art Exp $ */
+/*	$OpenBSD: syscall.h,v 1.3 2002/02/16 21:27:30 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -42,22 +42,22 @@
 #define _dl_check_error(__res) \
     ((int) __res < 0 && (int) __res >= -_dl_MAX_ERRNO)
 
-int	_dl_close __P((int));
-int	_dl_exit __P((int));
-int	_dl_getegid __P((void));
-int	_dl_geteuid __P((void));
-int	_dl_getgid __P((void));
-int	_dl_getuid __P((void));
+int	_dl_close(int);
+int	_dl_exit(int);
+int	_dl_getegid(void);
+int	_dl_geteuid(void);
+int	_dl_getgid(void);
+int	_dl_getuid(void);
 long	_dl___syscall(quad_t, ...);
-int	_dl_mprotect __P((const void *, int, int));
-int	_dl_munmap __P((const void*, unsigned int));
-int	_dl_open __P((const char*, unsigned int));
-void	_dl_printf __P((const char *, ...));
-int	_dl_read __P((int, const char*, int));
+int	_dl_mprotect(const void *, int, int);
+int	_dl_munmap(const void*, unsigned int);
+int	_dl_open(const char*, unsigned int);
+void	_dl_printf(const char *, ...);
+int	_dl_read(int, const char*, int);
 #ifdef USE_CACHE
-int	_dl_stat __P((const char *, struct stat *));
+int	_dl_stat(const char *, struct stat *);
 #endif
-int	_dl_write __P((int, const char*, int));
+int	_dl_write(int, const char*, int);
 
 /*
  * Not an actual syscall, but we need something in assembly to say