Manual cleanup of remaining userland __P use (excluding packages maintained outside the tree)

4 files changed, 26 insertions, 36 deletions

diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h
index 181a8c5c765..35f54ea11d9 100644
--- a/usr.sbin/pkg_install/sign/extern.h
+++ b/usr.sbin/pkg_install/sign/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.5 2002/02/17 19:42:38 millert Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
  *
@@ -38,19 +38,19 @@ struct mygzip_header;
 struct signature;
 
 /* common.c */
-extern int read_header_and_diagnose __P((FILE *file, \
+extern int read_header_and_diagnose(FILE *file, \
 	/*@out@*/struct mygzip_header *h, /*@null@*/struct signature **sign, \
-	const char *filename));
+	const char *filename);
 extern int reap(pid_t pid);
 
 /* sign.c */
-extern int sign __P((/*@observer@*/const char *filename, int type, \
-	/*@null@*/const char *userid, char *envp[]));
+extern int sign(/*@observer@*/const char *filename, int type, \
+	/*@null@*/const char *userid, char *envp[]);
 
 /* check.c */
-extern int check_signature __P((/*@dependent@*/FILE *file, \
+extern int check_signature(/*@dependent@*/FILE *file, \
 	/*@null@*/const char *userid, char *envp[], \
-	/*@observer@*/const char *filename));
+	/*@observer@*/const char *filename);
 
 #define PKG_BADSIG 0
 #define PKG_GOODSIG 1
@@ -65,14 +65,13 @@ typedef /*@observer@*/char *pchar;
 /* sha1.c */
 #define SHA1_DB_NAME	"/var/db/pkg/SHA1"
 
-extern void *new_sha1_checker __P((struct mygzip_header *h, \
+extern void *new_sha1_checker(struct mygzip_header *h, \
 	struct signature *sign, const char *userid, char *envp[], \
-	const char *filename));
+	const char *filename);
 
-extern void sha1_add __P((void *arg, const char *buffer, \
-	size_t length));
+extern void sha1_add(void *arg, const char *buffer, size_t length);
 
 extern int sha1_sign_ok(void *arg);
 
-extern int retrieve_sha1_marker __P((const char *filename, \
-	struct signature **sign, const char *userid));
+extern int retrieve_sha1_marker(const char *filename, \
+	struct signature **sign, const char *userid);
diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h
index f55be34cf15..1bc09f23439 100644
--- a/usr.sbin/pkg_install/sign/gzip.h
+++ b/usr.sbin/pkg_install/sign/gzip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gzip.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: gzip.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
  *
@@ -66,16 +66,16 @@ struct signature {
 #define GZIP_SIGNED 		1	/* gzip file, signature parsed ok */
 #define GZIP_NOT_GZIP 		2	/* not a proper gzip file */
 #define GZIP_NOT_PGPSIGNED 	3	/* gzip file, unknown extension */
-extern int gzip_read_header __P((FILE *f, /*@out@*/struct mygzip_header *h, \
-	/*@null@*/struct signature **sign));
+extern int gzip_read_header(FILE *f, /*@out@*/struct mygzip_header *h, \
+	/*@null@*/struct signature **sign);
 /* gzip_write_header returns 1 for success */
-extern int gzip_write_header __P((FILE *f, const struct mygzip_header *h, \
-	/*@null@*/struct signature *sign));
+extern int gzip_write_header(FILE *f, const struct mygzip_header *h, \
+	/*@null@*/struct signature *sign);
 /* writing header to memory. Returns size needed, or 0 if buffer too small
    buffer must be at least 14 characters */
-extern int gzip_copy_header __P((const struct mygzip_header *h, \
+extern int gzip_copy_header(const struct mygzip_header *h, \
 	/*@null@*/struct signature *sign, \
-	void (*add)(void *, const char *, size_t), void *data));
+	void (*add)(void *, const char *, size_t), void *data);
 
 extern void free_signature(/*@null@*/struct signature *sign);
 extern void sign_fill_tag(struct signature *sign);
diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h
index 641ab4cbab4..e179a26afa5 100644
--- a/usr.sbin/pkg_install/sign/pgp.h
+++ b/usr.sbin/pkg_install/sign/pgp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgp.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: pgp.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 /* Estimate size of pgp signature */
 #define MAXPGPSIGNSIZE	1024
 
@@ -9,16 +9,15 @@
 struct mygzip_header;
 struct signature;
 
-extern void *new_pgp_checker __P((struct mygzip_header *h, \
+extern void *new_pgp_checker(struct mygzip_header *h, \
 	struct signature *sign, const char *userid, char *envp[], \
-	const char *filename));
+	const char *filename);
 
-extern void pgp_add __P((void *arg, const char *buffer, \
-	size_t length));
+extern void pgp_add(void *arg, const char *buffer, size_t length);
 
 extern int pgp_sign_ok(void *arg);
 
 extern void handle_pgp_passphrase(void);
 
-extern int retrieve_pgp_signature __P((const char *filename, \
-struct signature **sign, const char *userid, char *envp[]));
+extern int retrieve_pgp_signature(const char *filename, \
+	struct signature **sign, const char *userid, char *envp[]);
diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h
index 9dda6faa520..af61be3dff9 100644
--- a/usr.sbin/pkg_install/sign/stand.h
+++ b/usr.sbin/pkg_install/sign/stand.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stand.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: stand.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 
 /* provided to cater for BSD idiosyncrasies */
 
@@ -6,14 +6,6 @@
 #include <sys/param.h>
 #endif
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(x)	x
-#else
-#define __P(x) ()
-#endif
-#endif
-
 #if defined(BSD4_4)
 #include <err.h>
 #else