From 6d57a1a176004a7d8fc009cdcf760098f86e3263 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sat, 16 Feb 2002 21:28:12 +0000 Subject: 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. --- usr.bin/chpass/chpass.c | 16 ++++++++-------- usr.bin/chpass/chpass.h | 36 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'usr.bin/chpass') diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index d41925acb61..9958e511cff 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chpass.c,v 1.20 2001/08/27 02:57:07 millert Exp $ */ +/* $OpenBSD: chpass.c,v 1.21 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: chpass.c,v 1.20 2001/08/27 02:57:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: chpass.c,v 1.21 2002/02/16 21:27:44 millert Exp $"; #endif #endif /* not lint */ @@ -78,14 +78,14 @@ extern char *__progname; int use_yp; int force_yp = 0; extern struct passwd *ypgetpwnam(), *ypgetpwuid(); -int _yp_check __P((char **)); -int pw_yp __P((struct passwd *, uid_t)); +int _yp_check(char **); +int pw_yp(struct passwd *, uid_t); #endif -void baduser __P((void)); -void tempcleanup __P((void)); -void kbintr __P((int)); -void usage __P((void)); +void baduser(void); +void tempcleanup(void); +void kbintr(int); +void usage(void); int main(argc, argv) diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h index 7a7027cdb8e..58dd95b6bf6 100644 --- a/usr.bin/chpass/chpass.h +++ b/usr.bin/chpass/chpass.h @@ -1,4 +1,4 @@ -/* $OpenBSD: chpass.h,v 1.4 1998/03/30 06:59:29 deraadt Exp $ */ +/* $OpenBSD: chpass.h,v 1.5 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: chpass.h,v 1.4 1996/05/15 21:50:44 jtc Exp $ */ /* @@ -54,20 +54,20 @@ typedef struct _entry { extern ENTRY list[]; extern uid_t uid; -int atot __P((char *, time_t *)); -void display __P((char *, int, struct passwd *)); -void edit __P((char *, struct passwd *)); -char *ok_shell __P((char *)); -int p_change __P((char *, struct passwd *, ENTRY *)); -int p_class __P((char *, struct passwd *, ENTRY *)); -int p_expire __P((char *, struct passwd *, ENTRY *)); -int p_gecos __P((char *, struct passwd *, ENTRY *)); -int p_gid __P((char *, struct passwd *, ENTRY *)); -int p_hdir __P((char *, struct passwd *, ENTRY *)); -int p_login __P((char *, struct passwd *, ENTRY *)); -int p_login __P((char *, struct passwd *, ENTRY *)); -int p_passwd __P((char *, struct passwd *, ENTRY *)); -int p_shell __P((char *, struct passwd *, ENTRY *)); -int p_uid __P((char *, struct passwd *, ENTRY *)); -char *ttoa __P((char *, size_t, time_t)); -int verify __P((char *, struct passwd *)); +int atot(char *, time_t *); +void display(char *, int, struct passwd *); +void edit(char *, struct passwd *); +char *ok_shell(char *); +int p_change(char *, struct passwd *, ENTRY *); +int p_class(char *, struct passwd *, ENTRY *); +int p_expire(char *, struct passwd *, ENTRY *); +int p_gecos(char *, struct passwd *, ENTRY *); +int p_gid(char *, struct passwd *, ENTRY *); +int p_hdir(char *, struct passwd *, ENTRY *); +int p_login(char *, struct passwd *, ENTRY *); +int p_login(char *, struct passwd *, ENTRY *); +int p_passwd(char *, struct passwd *, ENTRY *); +int p_shell(char *, struct passwd *, ENTRY *); +int p_uid(char *, struct passwd *, ENTRY *); +char *ttoa(char *, size_t, time_t); +int verify(char *, struct passwd *); -- cgit v1.2.3