Cleanup of userland __P use

7 files changed, 78 insertions, 76 deletions

diff --git a/usr.sbin/cron/cron/cron.c b/usr.sbin/cron/cron/cron.c
index 671d970..46d2fdf 100644
--- a/usr.sbin/cron/cron/cron.c
+++ b/usr.sbin/cron/cron/cron.c
@@ -32,17 +32,17 @@ static const char rcsid[] =
 #endif
 
 
-static	void	usage __P((void)),
-		run_reboot_jobs __P((cron_db *)),
-		cron_tick __P((cron_db *)),
-		cron_sync __P((void)),
-		cron_sleep __P((cron_db *)),
-		cron_clean __P((cron_db *)),
+static	void	usage(void),
+		run_reboot_jobs(cron_db *),
+		cron_tick(cron_db *),
+		cron_sync(void),
+		cron_sleep(cron_db *),
+		cron_clean(cron_db *),
 #ifdef USE_SIGCHLD
-		sigchld_handler __P((int)),
+		sigchld_handler(int),
 #endif
-		sighup_handler __P((int)),
-		parse_args __P((int c, char *v[]));
+		sighup_handler(int),
+		parse_args(int c, char *v[]);
 
 static time_t	last_time = 0;
 static int	dst_enabled = 0;
diff --git a/usr.sbin/cron/cron/cron.h b/usr.sbin/cron/cron/cron.h
index 6277719..35f75e8 100644
--- a/usr.sbin/cron/cron/cron.h
+++ b/usr.sbin/cron/cron/cron.h
@@ -199,49 +199,49 @@ typedef	struct _cron_db {
 } cron_db;
 
 
-void		set_cron_uid __P((void)),
-		set_cron_cwd __P((void)),
-		load_database __P((cron_db *)),
-		open_logfile __P((void)),
-		sigpipe_func __P((void)),
-		job_add __P((entry *, user *)),
-		do_command __P((entry *, user *)),
-		link_user __P((cron_db *, user *)),
-		unlink_user __P((cron_db *, user *)),
-		free_user __P((user *)),
-		env_free __P((char **)),
-		unget_char __P((int, FILE *)),
-		free_entry __P((entry *)),
-		skip_comments __P((FILE *)),
-		log_it __P((char *, int, char *, char *)),
-		log_close __P((void));
-
-int		job_runqueue __P((void)),
-		set_debug_flags __P((char *)),
-		get_char __P((FILE *)),
-		get_string __P((char *, int, FILE *, char *)),
-		swap_uids __P((void)),
-		load_env __P((char *, FILE *)),
-		cron_pclose __P((FILE *)),
-		strcmp_until __P((char *, char *, int)),
-		allowed __P((char *)),
-		strdtb __P((char *));
-
-char		*env_get __P((char *, char **)),
-		*arpadate __P((time_t *)),
-		*mkprints __P((unsigned char *, unsigned int)),
-		*first_word __P((char *, char *)),
-		**env_init __P((void)),
-		**env_copy __P((char **)),
-		**env_set __P((char **, char *));
-
-user		*load_user __P((int, struct passwd *, char *)),
-		*find_user __P((cron_db *, char *));
-
-entry		*load_entry __P((FILE *, void (*)(),
-				 struct passwd *, char **));
-
-FILE		*cron_popen __P((char *, char *, entry *));
+void		set_cron_uid(void),
+		set_cron_cwd(void),
+		load_database(cron_db *),
+		open_logfile(void),
+		sigpipe_func(void),
+		job_add(entry *, user *),
+		do_command(entry *, user *),
+		link_user(cron_db *, user *),
+		unlink_user(cron_db *, user *),
+		free_user(user *),
+		env_free(char **),
+		unget_char(int, FILE *),
+		free_entry(entry *),
+		skip_comments(FILE *),
+		log_it(char *, int, char *, char *),
+		log_close(void);
+
+int		job_runqueue(void),
+		set_debug_flags(char *),
+		get_char(FILE *),
+		get_string(char *, int, FILE *, char *),
+		swap_uids(void),
+		load_env(char *, FILE *),
+		cron_pclose(FILE *),
+		strcmp_until(char *, char *, int),
+		allowed(char *),
+		strdtb(char *);
+
+char		*env_get(char *, char **),
+		*arpadate(time_t *),
+		*mkprints(unsigned char *, unsigned int),
+		*first_word(char *, char *),
+		**env_init(void),
+		**env_copy(char **),
+		**env_set(char **, char *);
+
+user		*load_user(int, struct passwd *, char *),
+		*find_user(cron_db *, char *);
+
+entry		*load_entry(FILE *, void (*)(),
+				 struct passwd *, char **);
+
+FILE		*cron_popen(char *, char *, entry *);
 
 
 				/* in the C tradition, we only create
diff --git a/usr.sbin/cron/cron/database.c b/usr.sbin/cron/cron/database.c
index 6c364c9..7a44d14 100644
--- a/usr.sbin/cron/cron/database.c
+++ b/usr.sbin/cron/cron/database.c
@@ -33,9 +33,9 @@ static const char rcsid[] =
 #define TMAX(a,b) ((a)>(b)?(a):(b))
 
 
-static	void		process_crontab __P((char *, char *, char *,
+static	void		process_crontab(char *, char *, char *,
 					     struct stat *,
-					     cron_db *, cron_db *));
+					     cron_db *, cron_db *);
 
 
 void
diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c
index afc8317..b224880 100644
--- a/usr.sbin/cron/cron/do_command.c
+++ b/usr.sbin/cron/cron/do_command.c
@@ -38,8 +38,8 @@ static const char rcsid[] =
 #endif
 
 
-static void		child_process __P((entry *, user *)),
-			do_univ __P((user *));
+static void		child_process(entry *, user *),
+			do_univ(user *);
 
 
 void
diff --git a/usr.sbin/cron/cron/externs.h b/usr.sbin/cron/cron/externs.h
index 3efe605..64bc8ac 100644
--- a/usr.sbin/cron/cron/externs.h
+++ b/usr.sbin/cron/cron/externs.h
@@ -1,3 +1,5 @@
+/*	$FreeBSD$	*/
+
 /* Copyright 1993,1994 by Paul Vixie
  * All rights reserved
  *
@@ -71,7 +73,7 @@ extern	void		*malloc(), *realloc();
  * external variables needed for the interface.
  */
 #if (!defined(BSD) || (BSD < 198911)) && !defined(ATT) && !defined(UNICOS)
-int	getopt __P((int, char * const *, const char *));
+int	getopt(int, char * const *, const char *);
 #endif
 
 #if (!defined(BSD) || (BSD < 199103))
@@ -109,19 +111,19 @@ extern	int optind, opterr, optopt;
 #endif
 
 #ifdef NEED_STRCASECMP
-extern	int		strcasecmp __P((char *, char *));
+extern	int		strcasecmp(char *, char *);
 #endif
 
 #ifdef NEED_STRDUP
-extern	char		*strdup __P((char *));
+extern	char		*strdup(char *);
 #endif
 
 #ifdef NEED_STRERROR
-extern	char		*strerror __P((int));
+extern	char		*strerror(int);
 #endif
 
 #ifdef NEED_FLOCK
-extern	int		flock __P((int, int));
+extern	int		flock(int, int);
 # define LOCK_SH 1
 # define LOCK_EX 2
 # define LOCK_NB 4
@@ -129,17 +131,17 @@ extern	int		flock __P((int, int));
 #endif
 
 #ifdef NEED_SETSID
-extern	int		setsid __P((void));
+extern	int		setsid(void);
 #endif
 
 #ifdef NEED_GETDTABLESIZE
-extern	int		getdtablesize __P((void));
+extern	int		getdtablesize(void);
 #endif
 
 #ifdef NEED_SETENV
-extern	int		setenv __P((char *, char *, int));
+extern	int		setenv(char *, char *, int);
 #endif
 
 #ifdef NEED_VFORK
-extern	PID_T		vfork __P((void));
+extern	PID_T		vfork(void);
 #endif
diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c
index 9ddd4b0..17206cb 100644
--- a/usr.sbin/cron/crontab/crontab.c
+++ b/usr.sbin/cron/crontab/crontab.c
@@ -63,13 +63,13 @@ static	FILE		*NewCrontab;
 static	int		CheckErrorCount;
 static	enum opt_t	Option;
 static	struct passwd	*pw;
-static	void		list_cmd __P((void)),
-			delete_cmd __P((void)),
-			edit_cmd __P((void)),
-			poke_daemon __P((void)),
-			check_error __P((char *)),
-			parse_args __P((int c, char *v[]));
-static	int		replace_cmd __P((void));
+static	void		list_cmd(void),
+			delete_cmd(void),
+			edit_cmd(void),
+			poke_daemon(void),
+			check_error(char *),
+			parse_args(int c, char *v[]);
+static	int		replace_cmd(void);
 
 
 static void
diff --git a/usr.sbin/cron/lib/entry.c b/usr.sbin/cron/lib/entry.c
index 33ace49..df88905 100644
--- a/usr.sbin/cron/lib/entry.c
+++ b/usr.sbin/cron/lib/entry.c
@@ -41,10 +41,10 @@ typedef	enum ecode {
 #endif
 } ecode_e;
 
-static char	get_list __P((bitstr_t *, int, int, char *[], int, FILE *)),
-		get_range __P((bitstr_t *, int, int, char *[], int, FILE *)),
-		get_number __P((int *, int, char *[], int, FILE *));
-static int	set_element __P((bitstr_t *, int, int, int));
+static char	get_list(bitstr_t *, int, int, char *[], int, FILE *),
+		get_range(bitstr_t *, int, int, char *[], int, FILE *),
+		get_number(int *, int, char *[], int, FILE *);
+static int	set_element(bitstr_t *, int, int, int);
 
 static char *ecodes[] =
 	{