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.

4 files changed, 45 insertions, 45 deletions

diff --git a/lib/libskey/put.c b/lib/libskey/put.c
index a2a2b06767f..9b95a6be39c 100644
--- a/lib/libskey/put.c
+++ b/lib/libskey/put.c
@@ -8,7 +8,7 @@
  *
  * Dictionary lookup and extraction.
  *
- * $OpenBSD: put.c,v 1.10 2001/06/20 22:17:21 millert Exp $
+ * $OpenBSD: put.c,v 1.11 2002/02/16 21:27:27 millert Exp $
  */
 
 #include <stdio.h>
@@ -19,10 +19,10 @@
 
 #include "skey.h"
 
-static unsigned int extract __P((char *, int, int));
-static void standard __P((char *));
-static void insert __P((char *, int, int, int));
-static int wsrch __P((char *, int, int));
+static unsigned int extract(char *, int, int);
+static void standard(char *);
+static void insert(char *, int, int, int);
+static int wsrch(char *, int, int);
 
 /* Standard dictionary for integer-word translations */
 static const char * const Wp[2048] = {
diff --git a/lib/libskey/skey.h b/lib/libskey/skey.h
index 38dc6fadbdc..37d9bd269fe 100644
--- a/lib/libskey/skey.h
+++ b/lib/libskey/skey.h
@@ -10,7 +10,7 @@
  *
  * Main client header
  *
- * $OpenBSD: skey.h,v 1.16 2001/06/23 22:28:23 millert Exp $
+ * $OpenBSD: skey.h,v 1.17 2002/02/16 21:27:28 millert Exp $
  */
 
 #ifndef _SKEY_H_
@@ -62,32 +62,32 @@ struct mc {
 #define _SKEY_RAND_FILE_PATH_	"/var/db/host.random"
 
 __BEGIN_DECLS
-void f __P((char *));
-int keycrunch __P((char *, char *, char *));
-char *btoe __P((char *, char *));
-char *put8 __P((char *, char *));
-int etob __P((char *, char *));
-void rip __P((char *));
-int skeychallenge __P((struct skey *, char *, char *));
-int skeylookup __P((struct skey *, char *));
-int skeyverify __P((struct skey *, char *));
-int skeyzero __P((struct skey *));
-void sevenbit __P((char *));
-void backspace __P((char *));
-char *skipspace __P((char *));
-char *readpass __P((char *, int));
-char *readskey __P((char *, int));
-int skey_authenticate __P((char *));
-int skey_passcheck __P((char *, char *));
-char *skey_keyinfo __P((char *));
-int skey_haskey __P((char *));
-int atob8 __P((char *, char *));
-int btoa8 __P((char *, char *));
-int htoi __P((int));
-const char *skey_get_algorithm __P((void));
-char *skey_set_algorithm __P((char *));
-int skeygetnext __P((struct skey *));
-int skey_unlock __P((struct skey *));
+void f(char *);
+int keycrunch(char *, char *, char *);
+char *btoe(char *, char *);
+char *put8(char *, char *);
+int etob(char *, char *);
+void rip(char *);
+int skeychallenge(struct skey *, char *, char *);
+int skeylookup(struct skey *, char *);
+int skeyverify(struct skey *, char *);
+int skeyzero(struct skey *);
+void sevenbit(char *);
+void backspace(char *);
+char *skipspace(char *);
+char *readpass(char *, int);
+char *readskey(char *, int);
+int skey_authenticate(char *);
+int skey_passcheck(char *, char *);
+char *skey_keyinfo(char *);
+int skey_haskey(char *);
+int atob8(char *, char *);
+int btoa8(char *, char *);
+int htoi(int);
+const char *skey_get_algorithm(void);
+char *skey_set_algorithm(char *);
+int skeygetnext(struct skey *);
+int skey_unlock(struct skey *);
 __END_DECLS
 
 #endif /* _SKEY_H_ */
diff --git a/lib/libskey/skeylogin.c b/lib/libskey/skeylogin.c
index e7de30d66ea..0cd761b75ed 100644
--- a/lib/libskey/skeylogin.c
+++ b/lib/libskey/skeylogin.c
@@ -10,7 +10,7 @@
  *
  * S/Key verification check, lookups, and authentication.
  * 
- * $OpenBSD: skeylogin.c,v 1.40 2001/12/07 05:09:33 millert Exp $
+ * $OpenBSD: skeylogin.c,v 1.41 2002/02/16 21:27:28 millert Exp $
  */
 
 #include <sys/param.h>
@@ -36,8 +36,8 @@
 
 #include "skey.h"
 
-static void skey_fakeprompt __P((char *, char *));
-static char *tgetline __P((int, char *, size_t, int));
+static void skey_fakeprompt(char *, char *);
+static char *tgetline(int, char *, size_t, int);
 
 /*
  * Return an skey challenge string for user 'name'. If successful,
diff --git a/lib/libskey/skeysubr.c b/lib/libskey/skeysubr.c
index a79117e5269..97b3f43e9e5 100644
--- a/lib/libskey/skeysubr.c
+++ b/lib/libskey/skeysubr.c
@@ -9,7 +9,7 @@
  *
  * S/Key misc routines.
  *
- * $OpenBSD: skeysubr.c,v 1.22 2002/01/24 23:01:19 millert Exp $
+ * $OpenBSD: skeysubr.c,v 1.23 2002/02/16 21:27:28 millert Exp $
  */
 
 #include <stdio.h>
@@ -31,13 +31,13 @@
 #define SKEY_HASH_DEFAULT	1
 #endif
 
-static int keycrunch_md4 __P((char *, char *, char *));
-static int keycrunch_md5 __P((char *, char *, char *));
-static int keycrunch_sha1 __P((char *, char *, char *));
-static int keycrunch_rmd160 __P((char *, char *, char *));
-static void lowcase __P((char *));
-static void skey_echo __P((int));
-static void trapped __P((int));
+static int keycrunch_md4(char *, char *, char *);
+static int keycrunch_md5(char *, char *, char *);
+static int keycrunch_sha1(char *, char *, char *);
+static int keycrunch_rmd160(char *, char *, char *);
+static void lowcase(char *);
+static void skey_echo(int);
+static void trapped(int);
 
 /* Current hash type (index into skey_hash_types array) */
 static int skey_hash_type = SKEY_HASH_DEFAULT;
@@ -49,7 +49,7 @@ static int skey_hash_type = SKEY_HASH_DEFAULT;
 #define SKEY_ALGORITH_LAST	4
 struct skey_algorithm_table {
 	const char *name;
-	int (*keycrunch) __P((char *, char *, char *));
+	int (*keycrunch)(char *, char *, char *);
 };
 static struct skey_algorithm_table skey_algorithm_table[] = {
 	{ "md4", keycrunch_md4 },
@@ -293,7 +293,7 @@ readpass(buf, n)
 	char *buf;
 	int n;
 {
-	void (*old_handler) __P(());
+	void (*old_handler)();
 
 	/* Turn off echoing */
 	skey_echo(0);