From: Eirik Nygaard Date: Thu, 6 Nov 2003 19:46:42 +0000 (+0000) Subject: Remove the rest of the __P macros in src/usr.sbin X-Git-Tag: v2.0.1~12708 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/2e33c2dad2fce97d1d762725d9226b31461cd6fe Remove the rest of the __P macros in src/usr.sbin --- diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index e8d40c4c65..f098fc53ca 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -13,7 +13,7 @@ * other than his own. * * $FreeBSD: src/usr.sbin/ac/ac.c,v 1.14.2.2 2002/03/12 19:55:04 phantom Exp $ - * $DragonFly: src/usr.sbin/ac/ac.c,v 1.3 2003/11/03 19:31:34 eirikn Exp $ + * $DragonFly: src/usr.sbin/ac/ac.c,v 1.4 2003/11/06 19:46:42 eirikn Exp $ */ #include @@ -90,8 +90,8 @@ struct utmp_list *log_in(struct utmp_list *, struct utmp *); struct utmp_list *log_out(struct utmp_list *, struct utmp *); int on_console(struct utmp_list *); void show(char *, time_t); -void show_today __P((struct user_list *, struct utmp_list *, - time_t)); +void show_today(struct user_list *, struct utmp_list *, + time_t); void show_users(struct user_list *); struct user_list *update_user(struct user_list *, char *, time_t); void usage(void); diff --git a/usr.sbin/cron/cron/compat.h b/usr.sbin/cron/cron/compat.h index 8bd8cb18c6..41023bdc1d 100644 --- a/usr.sbin/cron/cron/compat.h +++ b/usr.sbin/cron/cron/compat.h @@ -17,18 +17,9 @@ /* * $FreeBSD: src/usr.sbin/cron/cron/compat.h,v 1.5 1999/08/28 01:15:49 peter Exp $ - * $DragonFly: src/usr.sbin/cron/cron/compat.h,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/cron/cron/compat.h,v 1.3 2003/11/06 19:46:42 eirikn Exp $ */ -#ifndef __P -# ifdef __STDC__ -# define __P(x) x -# else -# define __P(x) () -# define const -# endif -#endif - #if defined(UNIXPC) || defined(unixpc) # define UNIXPC 1 # define ATT 1 diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c index a419031c88..3ff4a0d955 100644 --- a/usr.sbin/keyserv/setkey.c +++ b/usr.sbin/keyserv/setkey.c @@ -28,7 +28,7 @@ * * @(#)setkey.c 1.11 94/04/25 SMI * $FreeBSD: src/usr.sbin/keyserv/setkey.c,v 1.3 1999/08/28 01:16:41 peter Exp $ - * $DragonFly: src/usr.sbin/keyserv/setkey.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ + * $DragonFly: src/usr.sbin/keyserv/setkey.c,v 1.4 2003/11/06 19:46:42 eirikn Exp $ */ /* @@ -58,7 +58,7 @@ static MINT *MODULUS; static char *fetchsecretkey( uid_t ); static void writecache( char *, char *, des_block * ); static int readcache( char *, char *, des_block * ); -static void extractdeskey __P (( MINT *, 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; diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h index eeb89c18ee..5e3b0e8449 100644 --- a/usr.sbin/mrouted/defs.h +++ b/usr.sbin/mrouted/defs.h @@ -8,7 +8,7 @@ * * * $FreeBSD: src/usr.sbin/mrouted/defs.h,v 1.12.2.1 2001/07/19 01:41:11 kris Exp $ - * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.4 2003/11/03 19:31:38 eirikn Exp $ + * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.5 2003/11/06 19:46:42 eirikn Exp $ * defs.h,v 3.8.4.15 1998/03/01 02:51:42 fenner Exp */ @@ -58,14 +58,6 @@ /*XXX*/ typedef u_int u_int32; -#ifndef __P -#ifdef __STDC__ -#define __P(x) x -#else -#define __P(x) () -#endif -#endif - typedef void (*cfunc_t)(void *); typedef void (*ihfunc_t)(int, fd_set *); diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c index 07c30e887e..baf2cf460e 100644 --- a/usr.sbin/mrouted/mtrace.c +++ b/usr.sbin/mrouted/mtrace.c @@ -110,7 +110,7 @@ * The mtrace program is COPYRIGHT 1998 by Xerox Corporation. * * $FreeBSD: src/usr.sbin/mrouted/mtrace.c,v 1.17.2.3 2002/09/12 16:27:49 nectar Exp $ - * $DragonFly: src/usr.sbin/mrouted/mtrace.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ + * $DragonFly: src/usr.sbin/mrouted/mtrace.c,v 1.4 2003/11/06 19:46:42 eirikn Exp $ */ #include @@ -149,7 +149,7 @@ typedef unsigned int u_int32; /* XXX */ #include "mtrace.h" -const char version[] = "$DragonFly: src/usr.sbin/mrouted/mtrace.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $"; +const char version[] = "$DragonFly: src/usr.sbin/mrouted/mtrace.c,v 1.4 2003/11/06 19:46:42 eirikn Exp $"; #define DEFAULT_TIMEOUT 3 /* How long to wait before retrying requests */ #define DEFAULT_RETRIES 3 /* How many times to try */ @@ -300,14 +300,6 @@ int ip_addlen = 0; /* Workaround for Option bug #2 */ */ #define MaX(a,b) ((a) > (b) ? (a) : (b)) -#ifndef __P -#ifdef __STDC__ -#define __P(x) x -#else -#define __P(x) () -#endif -#endif - typedef int (*callback_t)(int, u_char *, int, struct igmp *, int, struct sockaddr *, int *, struct timeval *); diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h index 6969faced3..3a8f509491 100644 --- a/usr.sbin/pkg_install/sign/stand.h +++ b/usr.sbin/pkg_install/sign/stand.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/pkg_install/sign/stand.h,v 1.1.2.1 2001/03/05 03:43:53 wes Exp $ */ -/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/stand.h,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ +/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/stand.h,v 1.4 2003/11/06 19:46:42 eirikn Exp $ */ /* $OpenBSD: stand.h,v 1.2 1999/10/04 21:46:30 espie Exp $ */ /* provided to cater for BSD idiosyncrasies */ @@ -8,14 +8,6 @@ #include #endif -#ifndef __P -#ifdef __STDC__ -#define __P(x) x -#else -#define __P(x) () -#endif -#endif - #if defined(BSD4_4) #include #else