Cleanup of userland __P use

3 files changed, 26 insertions, 26 deletions

diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 9a907a7f379a..04e4972e483c 100644
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -72,10 +72,10 @@ static const char rcsid[] =
 #define KEYSERVSOCK "/var/run/keyservsock"
 #endif
 
-static void randomize __P(( des_block * ));
-static void usage __P(( void ));
-static int getrootkey __P(( des_block *, int ));
-static int root_auth __P(( SVCXPRT *, struct svc_req * ));
+static void randomize( des_block * );
+static void usage( void );
+static int getrootkey( des_block *, int );
+static int root_auth( SVCXPRT *, struct svc_req * );
 
 #ifdef DEBUG
 static int debugging = 1;
@@ -102,9 +102,9 @@ extern cryptkeyres *(*__key_decryptsession_pk_LOCAL)();
 extern des_block *(*__key_gendes_LOCAL)();
 extern int (*__des_crypt_LOCAL)();
 
-cryptkeyres *key_encrypt_pk_2_svc_prog __P(( uid_t, cryptkeyarg2 * ));
-cryptkeyres *key_decrypt_pk_2_svc_prog __P(( uid_t, cryptkeyarg2 * ));
-des_block *key_gen_1_svc_prog __P(( void *, struct svc_req * ));
+cryptkeyres *key_encrypt_pk_2_svc_prog( uid_t, cryptkeyarg2 * );
+cryptkeyres *key_decrypt_pk_2_svc_prog( uid_t, cryptkeyarg2 * );
+des_block *key_gen_1_svc_prog( void *, struct svc_req * );
 
 int
 main(argc, argv)
diff --git a/usr.sbin/keyserv/keyserv.h b/usr.sbin/keyserv/keyserv.h
index 549a41bae253..07e4ab6efa8e 100644
--- a/usr.sbin/keyserv/keyserv.h
+++ b/usr.sbin/keyserv/keyserv.h
@@ -1,17 +1,17 @@
 /*
  * $FreeBSD$
  */
-extern void setmodulus __P((char *modx));
+extern void setmodulus(char *modx);
 
-extern keystatus pk_setkey __P(( uid_t, keybuf ));
-extern keystatus pk_encrypt __P(( uid_t, char *, netobj *, des_block * ));
-extern keystatus pk_decrypt __P(( uid_t, char *, netobj *, des_block * ));
-extern keystatus pk_netput __P(( uid_t, key_netstarg * ));
-extern keystatus pk_netget __P(( uid_t, key_netstarg * ));
-extern keystatus pk_get_conv_key __P(( uid_t, keybuf, cryptkeyres * ));
-extern void pk_nodefaultkeys __P(( void ));
+extern keystatus pk_setkey( uid_t, keybuf );
+extern keystatus pk_encrypt( uid_t, char *, netobj *, des_block * );
+extern keystatus pk_decrypt( uid_t, char *, netobj *, des_block * );
+extern keystatus pk_netput( uid_t, key_netstarg * );
+extern keystatus pk_netget( uid_t, key_netstarg * );
+extern keystatus pk_get_conv_key( uid_t, keybuf, cryptkeyres * );
+extern void pk_nodefaultkeys( void );
 
-extern void crypt_prog_1 __P(( struct svc_req *, register SVCXPRT * ));
-extern void load_des __P(( int, char * ));
+extern void crypt_prog_1( struct svc_req *, register SVCXPRT * );
+extern void load_des( int, char * );
 
-extern int (*_my_crypt)__P(( char *, int, struct desparams * ));
+extern int (*_my_crypt)( char *, int, struct desparams * );
diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c
index 566b1c79834c..046a358c56f2 100644
--- a/usr.sbin/keyserv/setkey.c
+++ b/usr.sbin/keyserv/setkey.c
@@ -59,12 +59,12 @@ static const char rcsid[] =
 #include "keyserv.h"
 
 static MINT *MODULUS;
-static char *fetchsecretkey __P(( uid_t ));
-static void writecache __P(( char *, char *, des_block * ));
-static int readcache __P(( char *, char *, des_block * ));
-static void extractdeskey __P (( MINT *, des_block * ));
-static int storesecretkey __P(( uid_t, keybuf ));
-static keystatus pk_crypt __P(( uid_t, char *, netobj *, des_block *, int));
+static char *fetchsecretkey( uid_t );
+static void writecache( char *, char *, des_block * );
+static int readcache( char *, char *, des_block * );
+static void extractdeskey( MINT *, des_block * );
+static int storesecretkey( uid_t, keybuf );
+static keystatus pk_crypt( uid_t, char *, netobj *, des_block *, int);
 static int nodefaultkeys = 0;
 
 
@@ -129,8 +129,8 @@ pk_decrypt(uid, remote_name, remote_key, key)
 	return (pk_crypt(uid, remote_name, remote_key, key, DES_DECRYPT));
 }
 
-static int store_netname __P(( uid_t, key_netstarg * ));
-static int fetch_netname __P(( uid_t, key_netstarg * ));
+static int store_netname( uid_t, key_netstarg * );
+static int fetch_netname( uid_t, key_netstarg * );
 
 keystatus
 pk_netput(uid, netstore)