summaryrefslogtreecommitdiff
path: root/sbin/init/init.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-02-16 21:28:12 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-02-16 21:28:12 +0000
commit6d57a1a176004a7d8fc009cdcf760098f86e3263 (patch)
treeee423c619fad03813234b9362694a17f3a638f0b /sbin/init/init.c
parentc707cb295fc3cac8d8feb343e949e0dcf71b8476 (diff)
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.
Diffstat (limited to 'sbin/init/init.c')
-rw-r--r--sbin/init/init.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 30a62c17039..9cabc9c0409 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $ */
+/* $OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $ */
/* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */
/*-
@@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $";
#endif
#endif /* not lint */
@@ -105,38 +105,38 @@ static char rcsid[] = "$OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $";
#define DEFAULT_STATE runcom
#endif
-void handle __P((sig_t, ...));
-void delset __P((sigset_t *, ...));
+void handle(sig_t, ...);
+void delset(sigset_t *, ...);
-void stall __P((char *, ...));
-void warning __P((char *, ...));
-void emergency __P((char *, ...));
-void disaster __P((int));
-void badsys __P((int));
+void stall(char *, ...);
+void warning(char *, ...);
+void emergency(char *, ...);
+void disaster(int);
+void badsys(int);
/*
* We really need a recursive typedef...
* The following at least guarantees that the return type of (*state_t)()
* is sufficiently wide to hold a function pointer.
*/
-typedef long (*state_func_t) __P((void));
-typedef state_func_t (*state_t) __P((void));
-
-state_func_t single_user __P((void));
-state_func_t runcom __P((void));
-state_func_t read_ttys __P((void));
-state_func_t multi_user __P((void));
-state_func_t clean_ttys __P((void));
-state_func_t catatonia __P((void));
-state_func_t death __P((void));
-state_func_t nice_death __P((void));
+typedef long (*state_func_t)(void);
+typedef state_func_t (*state_t)(void);
+
+state_func_t single_user(void);
+state_func_t runcom(void);
+state_func_t read_ttys(void);
+state_func_t multi_user(void);
+state_func_t clean_ttys(void);
+state_func_t catatonia(void);
+state_func_t death(void);
+state_func_t nice_death(void);
enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT;
-void transition __P((state_t));
+void transition(state_t);
state_t requested_transition = DEFAULT_STATE;
-void setctty __P((char *));
+void setctty(char *);
typedef struct init_session {
int se_index; /* index of entry in ttys file */
@@ -155,33 +155,33 @@ typedef struct init_session {
struct init_session *se_next;
} session_t;
-void free_session __P((session_t *));
-session_t *new_session __P((session_t *, int, struct ttyent *));
+void free_session(session_t *);
+session_t *new_session(session_t *, int, struct ttyent *);
session_t *sessions;
-char **construct_argv __P((char *));
-void start_window_system __P((session_t *));
-void collect_child __P((pid_t));
-pid_t start_getty __P((session_t *));
-void transition_handler __P((int));
-void alrm_handler __P((int));
-void setsecuritylevel __P((int));
-int getsecuritylevel __P((void));
-int setupargv __P((session_t *, struct ttyent *));
+char **construct_argv(char *);
+void start_window_system(session_t *);
+void collect_child(pid_t);
+pid_t start_getty(session_t *);
+void transition_handler(int);
+void alrm_handler(int);
+void setsecuritylevel(int);
+int getsecuritylevel(void);
+int setupargv(session_t *, struct ttyent *);
int clang;
#ifdef LOGIN_CAP
-void setprocresources __P((char *));
+void setprocresources(char *);
#else
#define setprocresources(p)
#endif
-void clear_session_logs __P((session_t *));
+void clear_session_logs(session_t *);
-int start_session_db __P((void));
-void add_session __P((session_t *));
-void del_session __P((session_t *));
-session_t *find_session __P((pid_t));
+int start_session_db(void);
+void add_session(session_t *);
+void del_session(session_t *);
+session_t *find_session(pid_t);
DB *session_db;
/*