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.

5 files changed, 35 insertions, 35 deletions

diff --git a/sbin/wsconsctl/keysym.c b/sbin/wsconsctl/keysym.c
index 36123d9d69a..c41c921c22d 100644
--- a/sbin/wsconsctl/keysym.c
+++ b/sbin/wsconsctl/keysym.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keysym.c,v 1.1 2000/07/01 23:52:45 mickey Exp $	*/
+/*	$OpenBSD: keysym.c,v 1.2 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: keysym.c,v 1.3 1999/02/08 11:08:23 hannken Exp $ */
 
 /*-
@@ -87,12 +87,12 @@ static const u_char latin1_to_upper[256] = {
 	0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0x00,		/* f */
 };
 
-static int qcmp_name __P((const void *, const void *));
-static int qcmp_ksym __P((const void *, const void *));
-static int bcmp_name __P((const void *, const void *));
-static int bcmp_ksym __P((const void *, const void *));
+static int qcmp_name(const void *, const void *);
+static int qcmp_ksym(const void *, const void *);
+static int bcmp_name(const void *, const void *);
+static int bcmp_ksym(const void *, const void *);
 
-static void sort_ksym_tab __P((void));
+static void sort_ksym_tab(void);
 
 static int
 qcmp_name(a, b)
diff --git a/sbin/wsconsctl/map_parse.y b/sbin/wsconsctl/map_parse.y
index e96b521be5d..4ac444fe488 100644
--- a/sbin/wsconsctl/map_parse.y
+++ b/sbin/wsconsctl/map_parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map_parse.y,v 1.2 2001/08/26 17:35:13 deraadt Exp $	*/
+/*	$OpenBSD: map_parse.y,v 1.3 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: map_parse.y,v 1.2 1999/02/08 11:08:23 hannken Exp $ */
 
 /*-
@@ -67,7 +67,7 @@ static struct wscons_keymap mapdata[KS_NUMKEYCODES];
 struct wskbd_map_data newkbmap;		/* used in util.c */
 static struct wscons_keymap *cur_mp;
 
-static int ksym_lookup __P((keysym_t));
+static int ksym_lookup(keysym_t);
 
 static int
 ksym_lookup(ksym)
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c
index d645b5f8639..c555fa59426 100644
--- a/sbin/wsconsctl/util.c
+++ b/sbin/wsconsctl/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.6 2001/07/06 21:52:34 mickey Exp $ */
+/*	$OpenBSD: util.c,v 1.7 2002/02/16 21:27:38 millert Exp $ */
 /*	$NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */
 
 /*-
@@ -114,9 +114,9 @@ static const struct nameint kbdvar_tab[] = {
 	KB_VARTAB
 };
 
-char *int2name __P((int, int, const struct nameint *, int));
-int name2int __P((char *, const struct nameint *, int));
-void print_kmap __P((struct wskbd_map_data *));
+char *int2name(int, int, const struct nameint *, int);
+int name2int(char *, const struct nameint *, int);
+void print_kmap(struct wskbd_map_data *);
 
 struct field *
 field_by_name(field_tab, name)
diff --git a/sbin/wsconsctl/wsconsctl.c b/sbin/wsconsctl/wsconsctl.c
index 063ef3dbd3e..6dcd6333105 100644
--- a/sbin/wsconsctl/wsconsctl.c
+++ b/sbin/wsconsctl/wsconsctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsconsctl.c,v 1.9 2001/10/24 17:45:59 miod Exp $	*/
+/*	$OpenBSD: wsconsctl.c,v 1.10 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: wsconsctl.c,v 1.2 1998/12/29 22:40:20 hannken Exp $ */
 
 /*-
@@ -54,14 +54,14 @@ extern struct field keyboard_field_tab[];
 extern struct field mouse_field_tab[];
 extern struct field display_field_tab[];
 
-void usage __P((char *));
+void usage(char *);
 
 struct vartypesw {
 	const char *name, *file;
 	int fd;
 	struct field *field_tab;
-	void (*getval) __P((const char *pre, int));
-	void (*putval) __P((const char *pre, int));
+	void (*getval)(const char *pre, int);
+	void (*putval)(const char *pre, int);
 } typesw[] = {
 	{ "keyboard", PATH_KEYBOARD, -1, keyboard_field_tab,
 	  keyboard_get_values, keyboard_put_values },
@@ -72,7 +72,7 @@ struct vartypesw {
 	{ NULL }
 };
 
-struct vartypesw *tab_by_name __P((const char *));
+struct vartypesw *tab_by_name(const char *);
 
 void
 usage(msg)
diff --git a/sbin/wsconsctl/wsconsctl.h b/sbin/wsconsctl/wsconsctl.h
index ab639cbc184..4fa15e90b1b 100644
--- a/sbin/wsconsctl/wsconsctl.h
+++ b/sbin/wsconsctl/wsconsctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsconsctl.h,v 1.3 2001/06/30 02:12:57 mickey Exp $	*/
+/*	$OpenBSD: wsconsctl.h,v 1.4 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: wsconsctl.h 1.1 1998/12/28 14:01:17 hannken Exp $ */
 
 /*-
@@ -59,20 +59,20 @@ struct field {
 	int flags;
 };
 
-struct field *field_by_name __P((struct field *, char *));
-struct field *field_by_value __P((struct field *, void *));
-void pr_field __P((const char *, struct field *, const char *));
-void rd_field __P((struct field *, char *, int));
-int name2ksym __P((char *));
-char *ksym2name __P((int));
-keysym_t ksym_upcase __P((keysym_t));
-void keyboard_get_values __P((const char *,int));
-void keyboard_put_values __P((const char *,int));
-void mouse_get_values __P((const char *,int));
-void mouse_put_values __P((const char *,int));
-void display_get_values __P((const char *,int));
-void display_put_values __P((const char *,int));
-int yyparse __P((void));
-void yyerror __P((char *));
-int yylex __P((void));
-void map_scan_setinput __P((char *));
+struct field *field_by_name(struct field *, char *);
+struct field *field_by_value(struct field *, void *);
+void pr_field(const char *, struct field *, const char *);
+void rd_field(struct field *, char *, int);
+int name2ksym(char *);
+char *ksym2name(int);
+keysym_t ksym_upcase(keysym_t);
+void keyboard_get_values(const char *,int);
+void keyboard_put_values(const char *,int);
+void mouse_get_values(const char *,int);
+void mouse_put_values(const char *,int);
+void display_get_values(const char *,int);
+void display_put_values(const char *,int);
+int yyparse(void);
+void yyerror(char *);
+int yylex(void);
+void map_scan_setinput(char *);