From 9dbf638f09a3ee45768de45e3d72f7a2b87281b9 Mon Sep 17 00:00:00 2001 From: David Rhodus Date: Sun, 21 Sep 2003 04:27:16 +0000 Subject: [PATCH] * de-__P() --- bin/date/date.c | 10 +- bin/date/extern.h | 4 +- bin/dd/args.c | 34 ++--- bin/dd/dd.c | 14 +- bin/dd/extern.h | 32 ++-- bin/domainname/domainname.c | 6 +- bin/echo/echo.c | 4 +- bin/ed/ed.h | 148 +++++++++---------- bin/expr/expr.y | 60 ++++---- bin/hostname/hostname.c | 6 +- bin/mkdir/mkdir.c | 8 +- bin/mv/mv.c | 12 +- bin/pax/ar_io.c | 6 +- bin/pax/ar_subs.c | 8 +- bin/pax/cpio.c | 8 +- bin/pax/extern.h | 286 ++++++++++++++++++------------------ bin/pax/file_subs.c | 4 +- bin/pax/ftree.c | 4 +- bin/pax/options.c | 24 +-- bin/pax/pat_rep.c | 16 +- bin/pax/pax.c | 4 +- bin/pax/sel_subs.c | 10 +- bin/pax/tables.c | 4 +- bin/pax/tar.c | 10 +- bin/ps/extern.h | 80 +++++----- bin/ps/fmt.c | 6 +- bin/ps/keyword.c | 6 +- bin/ps/ps.c | 22 +-- bin/ps/ps.h | 6 +- bin/rmdir/rmdir.c | 8 +- bin/sleep/sleep.c | 6 +- bin/stty/cchar.c | 4 +- bin/stty/extern.h | 24 +-- bin/stty/gfmt.c | 4 +- bin/stty/key.c | 38 ++--- bin/stty/modes.c | 4 +- bin/stty/print.c | 8 +- bin/stty/stty.c | 4 +- bin/sync/sync.c | 4 +- bin/test/test.c | 32 ++-- 40 files changed, 489 insertions(+), 489 deletions(-) diff --git a/bin/date/date.c b/bin/date/date.c index 5f7dd8c2a8..a439708e2d 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1985, 1987, 1988, 1993 The Regents of the University of California. All rights reserved. * @(#)date.c 8.2 (Berkeley) 4/28/95 * $FreeBSD: src/bin/date/date.c,v 1.32.2.6 2001/10/31 17:31:51 dillon Exp $ - * $DragonFly: src/bin/date/date.c,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/date/date.c,v 1.3 2003/09/21 04:19:10 drhodus Exp $ */ #include @@ -58,11 +58,11 @@ time_t tval; int retval; -static void setthetime __P((const char *, const char *, int, int)); -static void badformat __P((void)); -static void usage __P((void)); +static void setthetime (const char *, const char *, int, int); +static void badformat (void); +static void usage (void); -int logwtmp __P((char *, char *, char *)); +int logwtmp (char *, char *, char *); int main(argc, argv) diff --git a/bin/date/extern.h b/bin/date/extern.h index 78188f2f5b..4cffafe77d 100644 --- a/bin/date/extern.h +++ b/bin/date/extern.h @@ -32,7 +32,7 @@ * * @(#)extern.h 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/date/extern.h,v 1.5 1999/08/27 23:13:59 peter Exp $ - * $DragonFly: src/bin/date/extern.h,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/date/extern.h,v 1.3 2003/09/21 04:19:10 drhodus Exp $ */ -int netsettime __P((time_t)); +int netsettime (time_t); diff --git a/bin/dd/args.c b/bin/dd/args.c index c1b14764f7..4170fb7491 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -36,7 +36,7 @@ * * @(#)args.c 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/bin/dd/args.c,v 1.25.2.2 2001/01/23 14:20:03 asmodai Exp $ - * $DragonFly: src/bin/dd/args.c,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/dd/args.c,v 1.3 2003/09/21 04:19:42 drhodus Exp $ */ #include @@ -50,25 +50,25 @@ #include "dd.h" #include "extern.h" -static int c_arg __P((const void *, const void *)); -static int c_conv __P((const void *, const void *)); -static void f_bs __P((char *)); -static void f_cbs __P((char *)); -static void f_conv __P((char *)); -static void f_count __P((char *)); -static void f_files __P((char *)); -static void f_ibs __P((char *)); -static void f_if __P((char *)); -static void f_obs __P((char *)); -static void f_of __P((char *)); -static void f_seek __P((char *)); -static void f_skip __P((char *)); -static quad_t get_num __P((char *)); -static off_t get_offset __P((char *)); +static int c_arg (const void *, const void *); +static int c_conv (const void *, const void *); +static void f_bs (char *); +static void f_cbs (char *); +static void f_conv (char *); +static void f_count (char *); +static void f_files (char *); +static void f_ibs (char *); +static void f_if (char *); +static void f_obs(char *); +static void f_of (char *); +static void f_seek (char *); +static void f_skip (char *); +static quad_t get_num (char *); +static off_t get_offset (char *); static const struct arg { const char *name; - void (*f) __P((char *)); + void (*f) (char *); u_int set, noset; } args[] = { { "bs", f_bs, C_BS, C_BS|C_IBS|C_OBS|C_OSYNC }, diff --git a/bin/dd/dd.c b/bin/dd/dd.c index d6d428b15f..ef07a2a487 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -37,7 +37,7 @@ * @(#) Copyright (c) 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)dd.c 8.5 (Berkeley) 4/2/94 * $FreeBSD: src/bin/dd/dd.c,v 1.27.2.3 2001/08/01 01:37:35 obrien Exp $ - * $DragonFly: src/bin/dd/dd.c,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/dd/dd.c,v 1.3 2003/09/21 04:19:42 drhodus Exp $ */ #include @@ -60,15 +60,15 @@ #include "dd.h" #include "extern.h" -static void dd_close __P((void)); -static void dd_in __P((void)); -int main __P((int, char *[])); -static void getfdtype __P((IO *)); -static void setup __P((void)); +static void dd_close (void); +static void dd_in (void); +int main (int, char *[]); +static void getfdtype (IO *); +static void setup (void); IO in, out; /* input/output state */ STAT st; /* statistics */ -void (*cfunc) __P((void)); /* conversion function */ +void (*cfunc) (void); /* conversion function */ quad_t cpy_cnt; /* # of blocks to copy */ off_t pending = 0; /* pending seek if sparse */ u_int ddflags; /* conversion options */ diff --git a/bin/dd/extern.h b/bin/dd/extern.h index 6e425053cf..1b98e5f91f 100644 --- a/bin/dd/extern.h +++ b/bin/dd/extern.h @@ -36,29 +36,29 @@ * * @(#)extern.h 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/bin/dd/extern.h,v 1.9.2.1 2000/08/07 08:30:17 ps Exp $ - * $DragonFly: src/bin/dd/extern.h,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/dd/extern.h,v 1.3 2003/09/21 04:19:42 drhodus Exp $ */ #include -void block __P((void)); -void block_close __P((void)); -void dd_out __P((int)); -void def __P((void)); -void def_close __P((void)); -void jcl __P((char **)); -void pos_in __P((void)); -void pos_out __P((void)); -void summary __P((void)); -void summaryx __P((int)); -void terminate __P((int)); -void unblock __P((void)); -void unblock_close __P((void)); -void bitswab __P((void *, size_t)); +void block (void); +void block_close (void); +void dd_out (int); +void def (void); +void def_close (void); +void jcl (char **); +void pos_in (void); +void pos_out (void); +void summary (void); +void summaryx (int); +void terminate (int); +void unblock (void); +void unblock_close (void); +void bitswab (void *, size_t); extern IO in, out; extern STAT st; -extern void (*cfunc) __P((void)); +extern void (*cfunc) (void); extern quad_t cpy_cnt; extern size_t cbsz; extern u_int ddflags; diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index c467e8dc16..34552d4c49 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1993 The Regents of the University of California. All rights reserved. * @(#)hostname.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/domainname/domainname.c,v 1.12.2.1 2001/08/01 02:32:16 obrien Exp $ - * $DragonFly: src/bin/domainname/domainname.c,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/domainname/domainname.c,v 1.3 2003/09/21 04:20:36 drhodus Exp $ */ #include @@ -44,8 +44,8 @@ #include #include -int main __P((int, char *[])); -void usage __P((void)); +int main (int, char *[]); +void usage (void); int main(argc,argv) diff --git a/bin/echo/echo.c b/bin/echo/echo.c index 6b6187e043..42c2f07c4d 100644 --- a/bin/echo/echo.c +++ b/bin/echo/echo.c @@ -33,14 +33,14 @@ * @(#) Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. * @(#)echo.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/echo/echo.c,v 1.8.2.1 2001/08/01 02:33:32 obrien Exp $ - * $DragonFly: src/bin/echo/echo.c,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/echo/echo.c,v 1.3 2003/09/21 04:21:11 drhodus Exp $ */ #include #include #include -int main __P((int, char *[])); +int main (int, char *[]); int main(argc, argv) diff --git a/bin/ed/ed.h b/bin/ed/ed.h index a52bf50a51..d15579a2f7 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -26,7 +26,7 @@ * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp * $FreeBSD: src/bin/ed/ed.h,v 1.13.2.1 2001/08/01 02:36:03 obrien Exp $ - * $DragonFly: src/bin/ed/ed.h,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/ed/ed.h,v 1.3 2003/09/21 04:21:35 drhodus Exp $ */ #include @@ -189,79 +189,79 @@ if ((i) > (n)) { \ #endif /* Local Function Declarations */ -void add_line_node __P((line_t *)); -int append_lines __P((long)); -int apply_subst_template __P((char *, regmatch_t *, int, int)); -int build_active_list __P((int)); -int cbc_decode __P((char *, FILE *)); -int cbc_encode __P((char *, int, FILE *)); -int check_addr_range __P((long, long)); -void clear_active_list __P((void)); -void clear_undo_stack __P((void)); -int close_sbuf __P((void)); -int copy_lines __P((long)); -int delete_lines __P((long, long)); -void des_error __P((char *)); -int display_lines __P((long, long, int)); -line_t *dup_line_node __P((line_t *)); -int exec_command __P((void)); -long exec_global __P((int, int)); -void expand_des_key __P((char *, char *)); -int extract_addr_range __P((void)); -char *extract_pattern __P((int)); -int extract_subst_tail __P((int *, long *)); -char *extract_subst_template __P((void)); -int filter_lines __P((long, long, char *)); -int flush_des_file __P((FILE *)); -line_t *get_addressed_line_node __P((long)); -pattern_t *get_compiled_pattern __P((void)); -int get_des_char __P((FILE *)); -char *get_extended_line __P((int *, int)); -char *get_filename __P((void)); -int get_keyword __P((void)); -long get_line_node_addr __P((line_t *)); -long get_matching_node_addr __P((pattern_t *, int)); -long get_marked_node_addr __P((int)); -char *get_sbuf_line __P((line_t *)); -int get_shell_command __P((void)); -int get_stream_line __P((FILE *)); -int get_tty_line __P((void)); -void handle_hup __P((int)); -void handle_int __P((int)); -void handle_winch __P((int)); -int has_trailing_escape __P((char *, char *)); -int hex_to_binary __P((int, int)); -void init_buffers __P((void)); -void init_des_cipher __P((void)); -int is_legal_filename __P((char *)); -int join_lines __P((long, long)); -int mark_line_node __P((line_t *, int)); -int move_lines __P((long)); -line_t *next_active_node __P(()); -long next_addr __P((void)); -int open_sbuf __P((void)); -char *parse_char_class __P((char *)); -int pop_undo_stack __P((void)); -undo_t *push_undo_stack __P((int, long, long)); -int put_des_char __P((int, FILE *)); -char *put_sbuf_line __P((char *)); -int put_stream_line __P((FILE *, char *, int)); -int put_tty_line __P((char *, int, long, int)); -void quit __P((int)); -long read_file __P((char *, long)); -long read_stream __P((FILE *, long)); -int search_and_replace __P((pattern_t *, int, int)); -int set_active_node __P((line_t *)); -void set_des_key __P((char *)); -void signal_hup __P((int)); -void signal_int __P((int)); -char *strip_escapes __P((char *)); -int substitute_matching_text __P((pattern_t *, line_t *, int, int)); -char *translit_text __P((char *, int, int, int)); -void unmark_line_node __P((line_t *)); -void unset_active_nodes __P((line_t *, line_t *)); -long write_file __P((char *, char *, long, long)); -long write_stream __P((FILE *, long, long)); +void add_line_node (line_t *); +int append_lines (long); +int apply_subst_template (char *, regmatch_t *, int, int); +int build_active_list (int); +int cbc_decode (char *, FILE *); +int cbc_encode (char *, int, FILE *); +int check_addr_range (long, long); +void clear_active_list (void); +void clear_undo_stack (void); +int close_sbuf (void); +int copy_lines (long); +int delete_lines (long, long); +void des_error (char *); +int display_lines (long, long, int); +line_t *dup_line_node (line_t *); +int exec_command (void); +long exec_global (int, int); +void expand_des_key (char *, char *); +int extract_addr_range (void); +char *extract_pattern (int); +int extract_subst_tail (int *, long *); +char *extract_subst_template (void); +int filter_lines (long, long, char *); +int flush_des_file (FILE *); +line_t *get_addressed_line_node (long); +pattern_t *get_compiled_pattern (void); +int get_des_char (FILE *); +char *get_extended_line (int *, int); +char *get_filename (void); +int get_keyword (void); +long get_line_node_addr (line_t *); +long get_matching_node_addr (pattern_t *, int); +long get_marked_node_addr (int); +char *get_sbuf_line (line_t *); +int get_shell_command (void); +int get_stream_line (FILE *); +int get_tty_line (void); +void handle_hup (int); +void handle_int (int); +void handle_winch (int); +int has_trailing_escape (char *, char *); +int hex_to_binary (int, int); +void init_buffers (void); +void init_des_cipher (void); +int is_legal_filename (char *); +int join_lines (long, long); +int mark_line_node (line_t *, int); +int move_lines (long); +line_t *next_active_node (); +long next_addr (void); +int open_sbuf (void); +char *parse_char_class (char *); +int pop_undo_stack (void); +undo_t *push_undo_stack (int, long, long); +int put_des_char (int, FILE *); +char *put_sbuf_line (char *); +int put_stream_line (FILE *, char *, int); +int put_tty_line (char *, int, long, int); +void quit (int); +long read_file (char *, long); +long read_stream (FILE *, long); +int search_and_replace (pattern_t *, int, int); +int set_active_node (line_t *); +void set_des_key (char *); +void signal_hup (int); +void signal_int (int); +char *strip_escapes (char *); +int substitute_matching_text (pattern_t *, line_t *, int, int); +char *translit_text (char *, int, int, int); +void unmark_line_node (line_t *); +void unset_active_nodes (line_t *, line_t *); +long write_file (char *, char *, long, long); +long write_stream (FILE *, long, long); /* global buffers */ extern char stdinbuf[]; diff --git a/bin/expr/expr.y b/bin/expr/expr.y index fd10743299..92143c6fa0 100644 --- a/bin/expr/expr.y +++ b/bin/expr/expr.y @@ -5,7 +5,7 @@ * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * * $FreeBSD: src/bin/expr/expr.y,v 1.14.2.3 2001/08/01 02:37:46 obrien Exp $ - * $DragonFly: src/bin/expr/expr.y,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/expr/expr.y,v 1.3 2003/09/21 04:21:56 drhodus Exp $ */ #include @@ -33,35 +33,35 @@ struct val { struct val *result; -int chk_div __P((quad_t, quad_t)); -int chk_minus __P((quad_t, quad_t, quad_t)); -int chk_plus __P((quad_t, quad_t, quad_t)); -int chk_times __P((quad_t, quad_t, quad_t)); -void free_value __P((struct val *)); -int is_zero_or_null __P((struct val *)); -int isstring __P((struct val *)); -int main __P((int, char **)); -struct val *make_integer __P((quad_t)); -struct val *make_str __P((const char *)); -struct val *op_and __P((struct val *, struct val *)); -struct val *op_colon __P((struct val *, struct val *)); -struct val *op_div __P((struct val *, struct val *)); -struct val *op_eq __P((struct val *, struct val *)); -struct val *op_ge __P((struct val *, struct val *)); -struct val *op_gt __P((struct val *, struct val *)); -struct val *op_le __P((struct val *, struct val *)); -struct val *op_lt __P((struct val *, struct val *)); -struct val *op_minus __P((struct val *, struct val *)); -struct val *op_ne __P((struct val *, struct val *)); -struct val *op_or __P((struct val *, struct val *)); -struct val *op_plus __P((struct val *, struct val *)); -struct val *op_rem __P((struct val *, struct val *)); -struct val *op_times __P((struct val *, struct val *)); -quad_t to_integer __P((struct val *)); -void to_string __P((struct val *)); -int yyerror __P((const char *)); -int yylex __P((void)); -int yyparse __P((void)); +int chk_div (quad_t, quad_t); +int chk_minus (quad_t, quad_t, quad_t); +int chk_plus (quad_t, quad_t, quad_t); +int chk_times (quad_t, quad_t, quad_t); +void free_value (struct val *); +int is_zero_or_null (struct val *); +int isstring (struct val *); +int main (int, char **); +struct val *make_integer (quad_t); +struct val *make_str (const char *); +struct val *op_and (struct val *, struct val *); +struct val *op_colon (struct val *, struct val *); +struct val *op_div (struct val *, struct val *); +struct val *op_eq (struct val *, struct val *); +struct val *op_ge (struct val *, struct val *); +struct val *op_gt (struct val *, struct val *); +struct val *op_le (struct val *, struct val *); +struct val *op_lt (struct val *, struct val *); +struct val *op_minus (struct val *, struct val *); +struct val *op_ne (struct val *, struct val *); +struct val *op_or (struct val *, struct val *); +struct val *op_plus (struct val *, struct val *); +struct val *op_rem (struct val *, struct val *); +struct val *op_times (struct val *, struct val *); +quad_t to_integer (struct val *); +void to_string (struct val *); +int yyerror (const char *); +int yylex (void); +int yyparse (void); char **av; %} diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c index d92ced7a75..2e64f98f35 100644 --- a/bin/hostname/hostname.c +++ b/bin/hostname/hostname.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1993 The Regents of the University of California. All rights reserved. * @(#)hostname.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/hostname/hostname.c,v 1.10.2.1 2001/08/01 02:40:23 obrien Exp $ - * $DragonFly: src/bin/hostname/hostname.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/hostname/hostname.c,v 1.3 2003/09/21 04:22:19 drhodus Exp $ */ #include @@ -44,8 +44,8 @@ #include #include -int main __P((int, char *[])); -void usage __P((void)); +int main (int, char *[]); +void usage (void); int main(argc,argv) diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 324ee4a430..2c9f78e913 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)mkdir.c 8.2 (Berkeley) 1/25/94 * $FreeBSD: src/bin/mkdir/mkdir.c,v 1.19.2.2 2001/08/01 04:42:37 obrien Exp $ - * $DragonFly: src/bin/mkdir/mkdir.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/mkdir/mkdir.c,v 1.3 2003/09/21 04:23:06 drhodus Exp $ */ #include @@ -48,9 +48,9 @@ #include #include -int build __P((char *, mode_t)); -int main __P((int, char *[])); -void usage __P((void)); +int build (char *, mode_t); +int main (int, char *[]); +void usage (void); int vflag; diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 67666b038c..f4ef70127f 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1989, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mv.c 8.2 (Berkeley) 4/2/94 * $FreeBSD: src/bin/mv/mv.c,v 1.24.2.5 2002/08/19 00:26:41 johan Exp $ - * $DragonFly: src/bin/mv/mv.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/mv/mv.c,v 1.3 2003/09/21 04:23:40 drhodus Exp $ */ #include @@ -59,11 +59,11 @@ int fflg, iflg, nflg, vflg; -int copy __P((char *, char *)); -int do_move __P((char *, char *)); -int fastcopy __P((char *, char *, struct stat *)); -int main __P((int, char *[])); -void usage __P((void)); +int copy (char *, char *); +int do_move (char *, char *); +int fastcopy (char *, char *, struct stat *); +int main (int, char *[]); +void usage (void); int main(argc, argv) diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 452d19dd22..a17d1340fd 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -36,7 +36,7 @@ * * @(#)ar_io.c 8.2 (Berkeley) 4/18/94 * $FreeBSD: src/bin/pax/ar_io.c,v 1.12.2.1 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/ar_io.c,v 1.3 2003/09/10 22:43:54 rob Exp $ + * $DragonFly: src/bin/pax/ar_io.c,v 1.4 2003/09/21 04:24:16 drhodus Exp $ */ #include @@ -81,9 +81,9 @@ char *arcname; /* printable name of archive */ const char *gzip_program; /* name of gzip program */ static pid_t zpid = -1; /* pid of child process */ -static int get_phys __P((void)); +static int get_phys (void); extern sigset_t s_mask; -static void ar_start_gzip __P((int, const char *, int)); +static void ar_start_gzip (int, const char *, int); /* * ar_open() diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index b544a89580..01efdc3403 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -36,7 +36,7 @@ * * @(#)ar_subs.c 8.2 (Berkeley) 4/18/94 * $FreeBSD: src/bin/pax/ar_subs.c,v 1.13.2.1 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/ar_subs.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/ar_subs.c,v 1.3 2003/09/21 04:24:16 drhodus Exp $ */ #include @@ -52,9 +52,9 @@ #include "pax.h" #include "extern.h" -static void wr_archive __P((register ARCHD *, int is_app)); -static int get_arc __P((void)); -static int next_head __P((register ARCHD *)); +static void wr_archive (register ARCHD *, int is_app); +static int get_arc (void); +static int next_head (register ARCHD *); extern sigset_t s_mask; /* diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index d4020fbc4b..fcf82326a5 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -36,7 +36,7 @@ * * @(#)cpio.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/pax/cpio.c,v 1.12.2.1 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/cpio.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/cpio.c,v 1.3 2003/09/21 04:24:16 drhodus Exp $ */ #include @@ -50,9 +50,9 @@ #include "cpio.h" #include "extern.h" -static int rd_nm __P((register ARCHD *, int)); -static int rd_ln_nm __P((register ARCHD *)); -static int com_rd __P((register ARCHD *)); +static int rd_nm (register ARCHD *, int); +static int rd_ln_nm (register ARCHD *); +static int com_rd (register ARCHD *); /* * Routines which support the different cpio versions diff --git a/bin/pax/extern.h b/bin/pax/extern.h index b61237ac84..9019836b59 100644 --- a/bin/pax/extern.h +++ b/bin/pax/extern.h @@ -36,7 +36,7 @@ * * @(#)extern.h 8.2 (Berkeley) 4/18/94 * $FreeBSD: src/bin/pax/extern.h,v 1.6.2.2 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/extern.h,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/extern.h,v 1.3 2003/09/21 04:24:16 drhodus Exp $ */ /* @@ -50,27 +50,27 @@ */ extern char *arcname; extern const char *gzip_program; -int ar_open __P((char *)); -void ar_close __P((void)); -void ar_drain __P((void)); -int ar_set_wr __P((void)); -int ar_app_ok __P((void)); -int ar_read __P((register char *, register int)); -int ar_write __P((register char *, register int)); -int ar_rdsync __P((void)); -int ar_fow __P((off_t, off_t *)); -int ar_rev __P((off_t )); -int ar_next __P((void)); +int ar_open (char *); +void ar_close (void); +void ar_drain (void); +int ar_set_wr (void); +int ar_app_ok (void); +int ar_read (register char *, register int); +int ar_write (register char *, register int); +int ar_rdsync (void); +int ar_fow (off_t, off_t *); +int ar_rev (off_t ); +int ar_next (void); /* * ar_subs.c */ extern u_long flcnt; -void list __P((void)); -void extract __P((void)); -void append __P((void)); -void archive __P((void)); -void copy __P((void)); +void list (void); +void extract (void); +void append (void); +void archive (void); +void copy (void); /* * buf_subs.c @@ -82,126 +82,126 @@ extern int rdblksz; extern off_t wrlimit; extern off_t rdcnt; extern off_t wrcnt; -int wr_start __P((void)); -int rd_start __P((void)); -void cp_start __P((void)); -int appnd_start __P((off_t)); -int rd_sync __P((void)); -void pback __P((char *, int)); -int rd_skip __P((off_t)); -void wr_fin __P((void)); -int wr_rdbuf __P((register char *, register int)); -int rd_wrbuf __P((register char *, register int)); -int wr_skip __P((off_t)); -int wr_rdfile __P((ARCHD *, int, off_t *)); -int rd_wrfile __P((ARCHD *, int, off_t *)); -void cp_file __P((ARCHD *, int, int)); -int buf_fill __P((void)); -int buf_flush __P((register int)); +int wr_start (void); +int rd_start (void); +void cp_start (void); +int appnd_start (off_t); +int rd_sync (void); +void pback (char *, int); +int rd_skip (off_t); +void wr_fin (void); +int wr_rdbuf (register char *, register int); +int rd_wrbuf (register char *, register int); +int wr_skip (off_t); +int wr_rdfile (ARCHD *, int, off_t *); +int rd_wrfile (ARCHD *, int, off_t *); +void cp_file (ARCHD *, int, int); +int buf_fill (void); +int buf_flush (register int); /* * cache.c */ -int uidtb_start __P((void)); -int gidtb_start __P((void)); -int usrtb_start __P((void)); -int grptb_start __P((void)); -char * name_uid __P((uid_t, int)); -char * name_gid __P((gid_t, int)); -int uid_name __P((char *, uid_t *)); -int gid_name __P((char *, gid_t *)); +int uidtb_start (void); +int gidtb_start (void); +int usrtb_start (void); +int grptb_start (void); +char * name_uid (uid_t, int); +char * name_gid (gid_t, int); +int uid_name (char *, uid_t *); +int gid_name (char *, gid_t *); /* * cpio.c */ -int cpio_strd __P((void)); -int cpio_trail __P((register ARCHD *)); -int cpio_endwr __P((void)); -int cpio_id __P((char *, int)); -int cpio_rd __P((register ARCHD *, register char *)); -off_t cpio_endrd __P((void)); -int cpio_stwr __P((void)); -int cpio_wr __P((register ARCHD *)); -int vcpio_id __P((char *, int)); -int crc_id __P((char *, int)); -int crc_strd __P((void)); -int vcpio_rd __P((register ARCHD *, register char *)); -off_t vcpio_endrd __P((void)); -int crc_stwr __P((void)); -int vcpio_wr __P((register ARCHD *)); -int bcpio_id __P((char *, int)); -int bcpio_rd __P((register ARCHD *, register char *)); -off_t bcpio_endrd __P((void)); -int bcpio_wr __P((register ARCHD *)); +int cpio_strd (void); +int cpio_trail (register ARCHD *); +int cpio_endwr (void); +int cpio_id (char *, int); +int cpio_rd (register ARCHD *, register char *); +off_t cpio_endrd (void); +int cpio_stwr (void); +int cpio_wr (register ARCHD *); +int vcpio_id (char *, int); +int crc_id (char *, int); +int crc_strd (void); +int vcpio_rd (register ARCHD *, register char *); +off_t vcpio_endrd (void); +int crc_stwr (void); +int vcpio_wr (register ARCHD *); +int bcpio_id (char *, int); +int bcpio_rd (register ARCHD *, register char *); +off_t bcpio_endrd (void); +int bcpio_wr (register ARCHD *); /* * file_subs.c */ -int file_creat __P((register ARCHD *)); -void file_close __P((register ARCHD *, int)); -int lnk_creat __P((register ARCHD *)); -int cross_lnk __P((register ARCHD *)); -int chk_same __P((register ARCHD *)); -int node_creat __P((register ARCHD *)); -int unlnk_exist __P((register char *, register int)); -int chk_path __P((register char *, uid_t, gid_t)); -void set_ftime __P((char *fnm, time_t mtime, time_t atime, int frc)); -int set_ids __P((char *, uid_t, gid_t)); -int set_lids __P((char *, uid_t, gid_t)); -void set_pmode __P((char *, mode_t)); -int file_write __P((int, char *, register int, int *, int *, int, char *)); -void file_flush __P((int, char *, int)); -void rdfile_close __P((register ARCHD *, register int *)); -int set_crc __P((register ARCHD *, register int)); +int file_creat (register ARCHD *); +void file_close (register ARCHD *, int); +int lnk_creat (register ARCHD *); +int cross_lnk (register ARCHD *); +int chk_same (register ARCHD *); +int node_creat (register ARCHD *); +int unlnk_exist (register char *, register int); +int chk_path (register char *, uid_t, gid_t); +void set_ftime (char *fnm, time_t mtime, time_t atime, int frc); +int set_ids (char *, uid_t, gid_t); +int set_lids (char *, uid_t, gid_t); +void set_pmode (char *, mode_t); +int file_write (int, char *, register int, int *, int *, int, char *); +void file_flush (int, char *, int); +void rdfile_close (register ARCHD *, register int *); +int set_crc (register ARCHD *, register int); /* * ftree.c */ -int ftree_start __P((void)); -int ftree_add __P((register char *, int)); -void ftree_sel __P((register ARCHD *)); -void ftree_chk __P((void)); -int next_file __P((register ARCHD *)); +int ftree_start (void); +int ftree_add (register char *, int); +void ftree_sel (register ARCHD *); +void ftree_chk (void); +int next_file (register ARCHD *); /* * gen_subs.c */ -void ls_list __P((register ARCHD *, time_t, FILE *)); -void ls_tty __P((register ARCHD *)); -int l_strncpy __P((register char *, register char *, int)); -u_long asc_ul __P((register char *, int, register int)); -int ul_asc __P((u_long, register char *, register int, register int)); +void ls_list (register ARCHD *, time_t, FILE *); +void ls_tty (register ARCHD *); +int l_strncpy (register char *, register char *, int); +u_long asc_ul (register char *, int, register int); +int ul_asc (u_long, register char *, register int, register int); #ifndef NET2_STAT -u_quad_t asc_uqd __P((register char *, int, register int)); -int uqd_asc __P((u_quad_t, register char *, register int, register int)); +u_quad_t asc_uqd (register char *, int, register int); +int uqd_asc (u_quad_t, register char *, register int, register int); #endif /* * getoldopt.c */ -int getoldopt __P((int, char **, char *)); +int getoldopt (int, char **, char *); /* * options.c */ extern FSUB fsub[]; extern int ford[]; -void options __P((register int, register char **)); -OPLIST * opt_next __P((void)); -int opt_add __P((register char *)); -int bad_opt __P((void)); +void options (register int, register char **); +OPLIST * opt_next (void); +int opt_add (register char *); +int bad_opt (void); char *chdname; /* * pat_rep.c */ -int rep_add __P((register char *)); -int pat_add __P((char *, char *)); -void pat_chk __P((void)); -int pat_sel __P((register ARCHD *)); -int pat_match __P((register ARCHD *)); -int mod_name __P((register ARCHD *)); -int set_dest __P((register ARCHD *, char *, int)); +int rep_add (register char *); +int pat_add (char *, char *); +void pat_chk (void); +int pat_sel (register ARCHD *); +int pat_match (register ARCHD *); +int mod_name (register ARCHD *); +int set_dest (register ARCHD *, char *, int); /* * pax.c @@ -239,62 +239,62 @@ extern FILE *listf; extern char *tempfile; extern char *tempbase; -int main __P((int, char **)); -void sig_cleanup __P((int)); +int main (int, char **); +void sig_cleanup (int); /* * sel_subs.c */ -int sel_chk __P((register ARCHD *)); -int grp_add __P((register char *)); -int usr_add __P((register char *)); -int trng_add __P((register char *)); +int sel_chk (register ARCHD *); +int grp_add (register char *); +int usr_add (register char *); +int trng_add (register char *); /* * tables.c */ -int lnk_start __P((void)); -int chk_lnk __P((register ARCHD *)); -void purg_lnk __P((register ARCHD *)); -void lnk_end __P((void)); -int ftime_start __P((void)); -int chk_ftime __P((register ARCHD *)); -int name_start __P((void)); -int add_name __P((register char *, int, char *)); -void sub_name __P((register char *, int *, size_t)); -int dev_start __P((void)); -int add_dev __P((register ARCHD *)); -int map_dev __P((register ARCHD *, u_long, u_long)); -int atdir_start __P((void)); -void atdir_end __P((void)); -void add_atdir __P((char *, dev_t, ino_t, time_t, time_t)); -int get_atdir __P((dev_t, ino_t, time_t *, time_t *)); -int dir_start __P((void)); -void add_dir __P((char *, int, struct stat *, int)); -void proc_dir __P((void)); -u_int st_hash __P((char *, int, int)); +int lnk_start (void); +int chk_lnk (register ARCHD *); +void purg_lnk (register ARCHD *); +void lnk_end (void); +int ftime_start (void); +int chk_ftime (register ARCHD *); +int name_start (void); +int add_name (register char *, int, char *); +void sub_name (register char *, int *, size_t); +int dev_start (void); +int add_dev (register ARCHD *); +int map_dev (register ARCHD *, u_long, u_long); +int atdir_start (void); +void atdir_end (void); +void add_atdir (char *, dev_t, ino_t, time_t, time_t); +int get_atdir (dev_t, ino_t, time_t *, time_t *); +int dir_start (void); +void add_dir (char *, int, struct stat *, int); +void proc_dir (void); +u_int st_hash (char *, int, int); /* * tar.c */ -int tar_endwr __P((void)); -off_t tar_endrd __P((void)); -int tar_trail __P((register char *, register int, register int *)); -int tar_id __P((register char *, int)); -int tar_opt __P((void)); -int tar_rd __P((register ARCHD *, register char *)); -int tar_wr __P((register ARCHD *)); -int ustar_strd __P((void)); -int ustar_stwr __P((void)); -int ustar_id __P((char *, int)); -int ustar_rd __P((register ARCHD *, register char *)); -int ustar_wr __P((register ARCHD *)); +int tar_endwr (void); +off_t tar_endrd (void); +int tar_trail (register char *, register int, register int *); +int tar_id (register char *, int); +int tar_opt (void); +int tar_rd (register ARCHD *, register char *); +int tar_wr (register ARCHD *); +int ustar_strd (void); +int ustar_stwr (void); +int ustar_id (char *, int); +int ustar_rd (register ARCHD *, register char *); +int ustar_wr (register ARCHD *); /* * tty_subs.c */ -int tty_init __P((void)); -void tty_prnt __P((const char *, ...)) __printflike(1, 2); -int tty_read __P((char *, int)); -void paxwarn __P((int, const char *, ...)) __printflike(2, 3); -void syswarn __P((int, int, const char *, ...)) __printflike(3, 4); +int tty_init (void); +void tty_prnt (const char *, ...) __printflike(1, 2); +int tty_read (char *, int); +void paxwarn (int, const char *, ...) __printflike(2, 3); +void syswarn (int, int, const char *, ...) __printflike(3, 4); diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 5e581cc7d0..7eb304a5f8 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -36,7 +36,7 @@ * * @(#)file_subs.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/pax/file_subs.c,v 1.12.2.1 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/file_subs.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/file_subs.c,v 1.3 2003/09/21 04:24:17 drhodus Exp $ */ #include @@ -54,7 +54,7 @@ #include "extern.h" static int -mk_link __P((register char *,register struct stat *,register char *, int)); +mk_link (register char *,register struct stat *,register char *, int); /* * routines that deal with file operations such as: creating, removing; diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 1f0d90d691..fc32905bc5 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -36,7 +36,7 @@ * * @(#)ftree.c 8.2 (Berkeley) 4/18/94 * $FreeBSD: src/bin/pax/ftree.c,v 1.13.2.1 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/ftree.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/ftree.c,v 1.3 2003/09/21 04:24:17 drhodus Exp $ */ #include @@ -75,7 +75,7 @@ static FTREE *ftcur = NULL; /* current file arg being processed */ static FTSENT *ftent = NULL; /* current file tree entry */ static int ftree_skip; /* when set skip to next file arg */ -static int ftree_arg __P((void)); +static int ftree_arg (void); /* * ftree_start() diff --git a/bin/pax/options.c b/bin/pax/options.c index 5b847bb81b..7721cfadd4 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -36,7 +36,7 @@ * * @(#)options.c 8.2 (Berkeley) 4/18/94 * $FreeBSD: src/bin/pax/options.c,v 1.13.2.3 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/options.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/options.c,v 1.3 2003/09/21 04:24:17 drhodus Exp $ */ #include @@ -63,17 +63,17 @@ static char flgch[] = FLGCH; /* list of all possible flags */ static OPLIST *ophead = NULL; /* head for format specific options -x */ static OPLIST *optail = NULL; /* option tail */ -static int no_op __P((void)); -static void printflg __P((unsigned int)); -static int c_frmt __P((const void *, const void *)); -static off_t str_offt __P((char *)); -static char *getline __P((FILE *fp)); -static void pax_options __P((register int, register char **)); -static void pax_usage __P((void)); -static void tar_options __P((register int, register char **)); -static void tar_usage __P((void)); -static void cpio_options __P((register int, register char **)); -static void cpio_usage __P((void)); +static int no_op (void); +static void printflg (unsigned int); +static int c_frmt (const void *, const void *); +static off_t str_offt (char *); +static char *getline (FILE *fp); +static void pax_options (register int, register char **); +static void pax_usage (void); +static void tar_options (register int, register char **); +static void tar_usage (void); +static void cpio_options (register int, register char **); +static void cpio_usage (void); /* errors from getline */ #define GETLINE_FILE_CORRUPT 1 diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index dccbe0dfe8..f123511815 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -36,7 +36,7 @@ * * @(#)pat_rep.c 8.2 (Berkeley) 4/18/94 * $FreeBSD: src/bin/pax/pat_rep.c,v 1.15.2.1 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/pat_rep.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/pat_rep.c,v 1.3 2003/09/21 04:24:17 drhodus Exp $ */ #include @@ -68,15 +68,15 @@ static PATTERN *pattail = NULL; /* file pattern match list tail */ static REPLACE *rephead = NULL; /* replacement string list head */ static REPLACE *reptail = NULL; /* replacement string list tail */ -static int rep_name __P((char *, int *, int)); -static int tty_rename __P((register ARCHD *)); -static int fix_path __P((char *, int *, char *, int)); -static int fn_match __P((register char *, register char *, char **)); -static char * range_match __P((register char *, register int)); +static int rep_name (char *, int *, int); +static int tty_rename (register ARCHD *); +static int fix_path (char *, int *, char *, int); +static int fn_match (register char *, register char *, char **); +static char * range_match (register char *, register int); #ifdef NET2_REGEX -static int resub __P((regexp *, char *, char *, register char *)); +static int resub (regexp *, char *, char *, register char *); #else -static int resub __P((regex_t *, regmatch_t *, char *, char *, char *)); +static int resub (regex_t *, regmatch_t *, char *, char *, char *); #endif /* diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 78fee53158..c6d8c3f6c0 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -37,7 +37,7 @@ * @(#) Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)pax.c 8.2 (Berkeley) 4/18/94 * $FreeBSD: src/bin/pax/pax.c,v 1.13.2.4 2002/11/07 15:29:53 imp Exp $ - * $DragonFly: src/bin/pax/pax.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/pax.c,v 1.3 2003/09/21 04:24:17 drhodus Exp $ */ #include @@ -56,7 +56,7 @@ #include #include "pax.h" #include "extern.h" -static int gen_init __P((void)); +static int gen_init (void); /* * PAX main routines, general globals and some simple start up routines diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index c60d3014a1..eac6d270cd 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -36,7 +36,7 @@ * * @(#)sel_subs.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/pax/sel_subs.c,v 1.11.2.1 2001/08/01 05:03:11 obrien Exp $ - * $DragonFly: src/bin/pax/sel_subs.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/sel_subs.c,v 1.3 2003/09/21 04:24:17 drhodus Exp $ */ #include @@ -53,10 +53,10 @@ #include "sel_subs.h" #include "extern.h" -static int str_sec __P((register char *, time_t *)); -static int usr_match __P((register ARCHD *)); -static int grp_match __P((register ARCHD *)); -static int trng_match __P((register ARCHD *)); +static int str_sec (register char *, time_t *); +static int usr_match (register ARCHD *); +static int grp_match (register ARCHD *); +static int trng_match (register ARCHD *); static TIME_RNG *trhead = NULL; /* time range list head */ static TIME_RNG *trtail = NULL; /* time range list tail */ diff --git a/bin/pax/tables.c b/bin/pax/tables.c index 997ba707a1..ad153b092e 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -36,7 +36,7 @@ * * @(#)tables.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/pax/tables.c,v 1.13.2.1 2001/08/01 05:03:12 obrien Exp $ - * $DragonFly: src/bin/pax/tables.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/tables.c,v 1.3 2003/09/21 04:24:17 drhodus Exp $ */ #include @@ -76,7 +76,7 @@ static int dirfd = -1; /* storage for setting created dir time/mode */ static u_long dircnt; /* entries in dir time/mode storage */ static int ffd = -1; /* tmp file for file time table name storage */ -static DEVT *chk_dev __P((dev_t, int)); +static DEVT *chk_dev (dev_t, int); /* * hard link table routines diff --git a/bin/pax/tar.c b/bin/pax/tar.c index 8fddc67a58..e28a7982ac 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -36,7 +36,7 @@ * * @(#)tar.c 8.2 (Berkeley) 4/18/94 * $FreeBSD: src/bin/pax/tar.c,v 1.13.2.1 2001/08/01 05:03:12 obrien Exp $ - * $DragonFly: src/bin/pax/tar.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/pax/tar.c,v 1.3 2003/09/21 04:24:17 drhodus Exp $ */ #include @@ -54,11 +54,11 @@ * Routines for reading, writing and header identify of various versions of tar */ -static u_long tar_chksm __P((register char *, register int)); -static char *name_split __P((register char *, register int)); -static int ul_oct __P((u_long, register char *, register int, int)); +static u_long tar_chksm (register char *, register int); +static char *name_split (register char *, register int); +static int ul_oct (u_long, register char *, register int, int); #ifndef NET2_STAT -static int uqd_oct __P((u_quad_t, register char *, register int, int)); +static int uqd_oct (u_quad_t, register char *, register int, int); #endif /* diff --git a/bin/ps/extern.h b/bin/ps/extern.h index 1b32a6daac..6806e235ca 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -32,7 +32,7 @@ * * @(#)extern.h 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/bin/ps/extern.h,v 1.9 1999/08/27 23:14:50 peter Exp $ - * $DragonFly: src/bin/ps/extern.h,v 1.3 2003/07/01 00:19:29 dillon Exp $ + * $DragonFly: src/bin/ps/extern.h,v 1.4 2003/09/21 04:24:47 drhodus Exp $ */ struct kinfo; @@ -47,43 +47,43 @@ extern VAR var[]; extern VARENT *vhead; __BEGIN_DECLS -void command __P((KINFO *, VARENT *)); -void cputime __P((KINFO *, VARENT *)); -int donlist __P((void)); -void evar __P((KINFO *, VARENT *)); -char *fmt_argv __P((char **, char *, int)); -double getpcpu __P((KINFO *)); -double getpmem __P((KINFO *)); -void logname __P((KINFO *, VARENT *)); -void longtname __P((KINFO *, VARENT *)); -void lstarted __P((KINFO *, VARENT *)); -void maxrss __P((KINFO *, VARENT *)); -void nlisterr __P((struct nlist *)); -void p_rssize __P((KINFO *, VARENT *)); -void pagein __P((KINFO *, VARENT *)); -void parsefmt __P((char *)); -void pcpu __P((KINFO *, VARENT *)); -void pnice __P((KINFO *, VARENT *)); -void pmem __P((KINFO *, VARENT *)); -void pri __P((KINFO *, VARENT *)); -void rtprior __P((KINFO *, VARENT *)); -void printheader __P((void)); -void pvar __P((KINFO *, VARENT *)); -void tvar __P((KINFO *, VARENT *)); -void rssize __P((KINFO *, VARENT *)); -void runame __P((KINFO *, VARENT *)); -int s_runame __P((KINFO *)); -void rvar __P((KINFO *, VARENT *)); -void showkey __P((void)); -void started __P((KINFO *, VARENT *)); -void state __P((KINFO *, VARENT *)); -void tdev __P((KINFO *, VARENT *)); -void tname __P((KINFO *, VARENT *)); -void tsize __P((KINFO *, VARENT *)); -void ucomm __P((KINFO *, VARENT *)); -void uname __P((KINFO *, VARENT *)); -int s_uname __P((KINFO *)); -void uvar __P((KINFO *, VARENT *)); -void vsize __P((KINFO *, VARENT *)); -void wchan __P((KINFO *, VARENT *)); +void command (KINFO *, VARENT *); +void cputime (KINFO *, VARENT *); +int donlist (void); +void evar (KINFO *, VARENT *); +char *fmt_argv (char **, char *, int); +double getpcpu (KINFO *); +double getpmem (KINFO *); +void logname (KINFO *, VARENT *); +void longtname (KINFO *, VARENT *); +void lstarted (KINFO *, VARENT *); +void maxrss (KINFO *, VARENT *); +void nlisterr (struct nlist *); +void p_rssize (KINFO *, VARENT *); +void pagein (KINFO *, VARENT *); +void parsefmt (char *); +void pcpu (KINFO *, VARENT *); +void pnice (KINFO *, VARENT *); +void pmem (KINFO *, VARENT *); +void pri (KINFO *, VARENT *); +void rtprior (KINFO *, VARENT *); +void printheader (void); +void pvar (KINFO *, VARENT *); +void tvar (KINFO *, VARENT *); +void rssize (KINFO *, VARENT *); +void runame (KINFO *, VARENT *); +int s_runame (KINFO *); +void rvar (KINFO *, VARENT *); +void showkey (void); +void started (KINFO *, VARENT *); +void state (KINFO *, VARENT *); +void tdev (KINFO *, VARENT *); +void tname (KINFO *, VARENT *); +void tsize (KINFO *, VARENT *); +void ucomm (KINFO *, VARENT *); +void uname (KINFO *, VARENT *); +int s_uname (KINFO *); +void uvar (KINFO *, VARENT *); +void vsize (KINFO *, VARENT *); +void wchan (KINFO *, VARENT *); __END_DECLS diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c index 08d5d6022c..07eb9f31fe 100644 --- a/bin/ps/fmt.c +++ b/bin/ps/fmt.c @@ -32,7 +32,7 @@ * * @(#)fmt.c 8.4 (Berkeley) 4/15/94 * $FreeBSD: src/bin/ps/fmt.c,v 1.14.2.1 2002/03/16 01:15:11 mikeh Exp $ - * $DragonFly: src/bin/ps/fmt.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/ps/fmt.c,v 1.3 2003/09/21 04:24:47 drhodus Exp $ */ #include @@ -46,8 +46,8 @@ #include #include "ps.h" -static char *cmdpart __P((char *)); -static char *shquote __P((char **)); +static char *cmdpart (char *); +static char *shquote (char **); /* * XXX diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 2e4125ed4c..58327925a9 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -32,7 +32,7 @@ * * @(#)keyword.c 8.5 (Berkeley) 4/2/94 * $FreeBSD: src/bin/ps/keyword.c,v 1.24.2.3 2002/10/10 20:05:32 jmallett Exp $ - * $DragonFly: src/bin/ps/keyword.c,v 1.6 2003/07/25 05:28:53 dillon Exp $ + * $DragonFly: src/bin/ps/keyword.c,v 1.7 2003/09/21 04:24:47 drhodus Exp $ */ #include @@ -53,8 +53,8 @@ #include "ps.h" -static VAR *findvar __P((char *)); -static int vcmp __P((const void *, const void *)); +static VAR *findvar (char *); +static int vcmp (const void *, const void *); #ifdef NOTINUSE int utime(), stime(), ixrss(), idrss(), isrss(); diff --git a/bin/ps/ps.c b/bin/ps/ps.c index a6fd74a02b..c68bb795a8 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1990, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)ps.c 8.4 (Berkeley) 4/2/94 * $FreeBSD: src/bin/ps/ps.c,v 1.30.2.6 2002/07/04 08:30:37 sobomax Exp $ - * $DragonFly: src/bin/ps/ps.c,v 1.3 2003/07/01 00:19:29 dillon Exp $ + * $DragonFly: src/bin/ps/ps.c,v 1.4 2003/09/21 04:24:47 drhodus Exp $ */ #include @@ -85,15 +85,15 @@ static int forceuread=1; enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT; -static char *fmt __P((char **(*)(kvm_t *, const struct kinfo_proc *, int), - KINFO *, char *, int)); -static char *kludge_oldps_options __P((char *)); -static int pscomp __P((const void *, const void *)); -static void saveuser __P((KINFO *)); -static void scanvars __P((void)); -static void dynsizevars __P((KINFO *)); -static void sizevars __P((void)); -static void usage __P((void)); +static char *fmt (char **(*)(kvm_t *, const struct kinfo_proc *, int), + KINFO *, char *, int); +static char *kludge_oldps_options (char *); +static int pscomp (const void *, const void *); +static void saveuser (KINFO *); +static void scanvars (void); +static void dynsizevars (KINFO *); +static void sizevars (void); +static void usage (void); static uid_t *getuids(const char *, int *); char dfmt[] = "pid tt state time command"; @@ -495,7 +495,7 @@ sizevars() static char * fmt(fn, ki, comm, maxlen) - char **(*fn) __P((kvm_t *, const struct kinfo_proc *, int)); + char **(*fn) (kvm_t *, const struct kinfo_proc *, int); KINFO *ki; char *comm; int maxlen; diff --git a/bin/ps/ps.h b/bin/ps/ps.h index b731f58782..f409710398 100644 --- a/bin/ps/ps.h +++ b/bin/ps/ps.h @@ -32,7 +32,7 @@ * * @(#)ps.h 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/ps/ps.h,v 1.7 1999/08/27 23:14:52 peter Exp $ - * $DragonFly: src/bin/ps/ps.h,v 1.3 2003/07/01 00:19:29 dillon Exp $ + * $DragonFly: src/bin/ps/ps.h,v 1.4 2003/09/21 04:24:47 drhodus Exp $ */ #define UNLIMITED 0 /* unlimited terminal width */ @@ -73,9 +73,9 @@ typedef struct var { #define DSIZ 0x08 /* field size is dynamic*/ u_int flag; /* output routine */ - void (*oproc) __P((struct kinfo *, struct varent *)); + void (*oproc) (struct kinfo *, struct varent *); /* sizing routine*/ - int (*sproc) __P((struct kinfo *)); + int (*sproc) (struct kinfo *); short width; /* printing width */ /* * The following (optional) elements are hooks for passing information diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index 933c10e951..8b5eea6837 100644 --- a/bin/rmdir/rmdir.c +++ b/bin/rmdir/rmdir.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)rmdir.c 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/bin/rmdir/rmdir.c,v 1.9.2.2 2001/08/01 05:16:47 obrien Exp $ - * $DragonFly: src/bin/rmdir/rmdir.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/rmdir/rmdir.c,v 1.3 2003/09/21 04:25:36 drhodus Exp $ */ #include @@ -43,9 +43,9 @@ #include #include -int main __P((int, char *[])); -int rm_path __P((char *)); -void usage __P((void)); +int main (int, char *[]); +int rm_path (char *); +void usage (void); int main(argc, argv) diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index dbf984c426..e06bdf3685 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)sleep.c 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/bin/sleep/sleep.c,v 1.9.2.1 2001/08/01 05:23:25 obrien Exp $ - * $DragonFly: src/bin/sleep/sleep.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/sleep/sleep.c,v 1.3 2003/09/21 04:26:06 drhodus Exp $ */ #include @@ -43,8 +43,8 @@ #include #include -int main __P((int, char *[])); -void usage __P((void)); +int main (int, char *[]); +void usage (void); int main(argc, argv) diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c index bcdddabc6f..281e84871d 100644 --- a/bin/stty/cchar.c +++ b/bin/stty/cchar.c @@ -32,7 +32,7 @@ * * @(#)cchar.c 8.5 (Berkeley) 4/2/94 * $FreeBSD: src/bin/stty/cchar.c,v 1.9.2.2 2001/07/04 22:40:00 kris Exp $ - * $DragonFly: src/bin/stty/cchar.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/stty/cchar.c,v 1.3 2003/09/21 04:26:26 drhodus Exp $ */ #include @@ -46,7 +46,7 @@ #include "stty.h" #include "extern.h" -static int c_cchar __P((const void *, const void *)); +static int c_cchar (const void *, const void *); /* * Special control characters. diff --git a/bin/stty/extern.h b/bin/stty/extern.h index b4b0f72d3c..afd6e9d115 100644 --- a/bin/stty/extern.h +++ b/bin/stty/extern.h @@ -32,19 +32,19 @@ * * @(#)extern.h 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/stty/extern.h,v 1.5 1999/08/27 23:15:40 peter Exp $ - * $DragonFly: src/bin/stty/extern.h,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/stty/extern.h,v 1.3 2003/09/21 04:26:26 drhodus Exp $ */ -int c_cchars __P((const void *, const void *)); -int c_modes __P((const void *, const void *)); -int csearch __P((char ***, struct info *)); -void checkredirect __P((void)); -void gprint __P((struct termios *, struct winsize *, int)); -void gread __P((struct termios *, char *)); -int ksearch __P((char ***, struct info *)); -int msearch __P((char ***, struct info *)); -void optlist __P((void)); -void print __P((struct termios *, struct winsize *, int, enum FMT)); -void usage __P((void)); +int c_cchars (const void *, const void *); +int c_modes (const void *, const void *); +int csearch (char ***, struct info *); +void checkredirect (void); +void gprint (struct termios *, struct winsize *, int); +void gread (struct termios *, char *); +int ksearch (char ***, struct info *); +int msearch (char ***, struct info *); +void optlist (void); +void print (struct termios *, struct winsize *, int, enum FMT); +void usage (void); extern struct cchar cchars1[], cchars2[]; diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c index 7a320c058c..5eea8f8864 100644 --- a/bin/stty/gfmt.c +++ b/bin/stty/gfmt.c @@ -32,7 +32,7 @@ * * @(#)gfmt.c 8.6 (Berkeley) 4/2/94 * $FreeBSD: src/bin/stty/gfmt.c,v 1.10.2.2 2001/08/01 05:26:12 obrien Exp $ - * $DragonFly: src/bin/stty/gfmt.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/stty/gfmt.c,v 1.3 2003/09/21 04:26:26 drhodus Exp $ */ #include @@ -44,7 +44,7 @@ #include "stty.h" #include "extern.h" -static void gerr __P((const char *s)); +static void gerr (const char *s); static void gerr(s) diff --git a/bin/stty/key.c b/bin/stty/key.c index 36b144e135..c584609ef4 100644 --- a/bin/stty/key.c +++ b/bin/stty/key.c @@ -32,7 +32,7 @@ * * @(#)key.c 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/bin/stty/key.c,v 1.11.2.2 2001/10/15 13:45:05 dd Exp $ - * $DragonFly: src/bin/stty/key.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/stty/key.c,v 1.3 2003/09/21 04:26:26 drhodus Exp $ */ #include @@ -47,28 +47,28 @@ #include "extern.h" __BEGIN_DECLS -static int c_key __P((const void *, const void *)); -void f_all __P((struct info *)); -void f_cbreak __P((struct info *)); -void f_columns __P((struct info *)); -void f_dec __P((struct info *)); -void f_ek __P((struct info *)); -void f_everything __P((struct info *)); -void f_extproc __P((struct info *)); -void f_ispeed __P((struct info *)); -void f_nl __P((struct info *)); -void f_ospeed __P((struct info *)); -void f_raw __P((struct info *)); -void f_rows __P((struct info *)); -void f_sane __P((struct info *)); -void f_size __P((struct info *)); -void f_speed __P((struct info *)); -void f_tty __P((struct info *)); +static int c_key (const void *, const void *); +void f_all (struct info *); +void f_cbreak (struct info *); +void f_columns (struct info *); +void f_dec (struct info *); +void f_ek (struct info *); +void f_everything (struct info *); +void f_extproc (struct info *); +void f_ispeed (struct info *); +void f_nl (struct info *); +void f_ospeed (struct info *); +void f_raw (struct info *); +void f_rows (struct info *); +void f_sane (struct info *); +void f_size (struct info *); +void f_speed (struct info *); +void f_tty (struct info *); __END_DECLS static struct key { const char *name; /* name */ - void (*f) __P((struct info *)); /* function */ + void (*f) (struct info *); /* function */ #define F_NEEDARG 0x01 /* needs an argument */ #define F_OFFOK 0x02 /* can turn off */ int flags; diff --git a/bin/stty/modes.c b/bin/stty/modes.c index 151a12cd77..0768a30413 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -32,7 +32,7 @@ * * @(#)modes.c 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/bin/stty/modes.c,v 1.8.2.2 2001/07/04 22:40:00 kris Exp $ - * $DragonFly: src/bin/stty/modes.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/stty/modes.c,v 1.3 2003/09/21 04:26:26 drhodus Exp $ */ #include @@ -40,7 +40,7 @@ #include #include "stty.h" -int msearch __P((char ***, struct info *)); +int msearch (char ***, struct info *); struct modes { const char *name; diff --git a/bin/stty/print.c b/bin/stty/print.c index 3405fbae90..969637b1b8 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -32,7 +32,7 @@ * * @(#)print.c 8.6 (Berkeley) 4/16/94 * $FreeBSD: src/bin/stty/print.c,v 1.12.2.2 2001/07/04 22:40:00 kris Exp $ - * $DragonFly: src/bin/stty/print.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/stty/print.c,v 1.3 2003/09/21 04:26:26 drhodus Exp $ */ #include @@ -46,9 +46,9 @@ #include /* XXX NTTYDISC is too well hidden */ -static void binit __P((const char *)); -static void bput __P((const char *)); -static const char *ccval __P((struct cchar *, int)); +static void binit (const char *); +static void bput (const char *); +static const char *ccval (struct cchar *, int); void print(tp, wp, ldisc, fmt) diff --git a/bin/stty/stty.c b/bin/stty/stty.c index 155730d90b..aecf3a6352 100644 --- a/bin/stty/stty.c +++ b/bin/stty/stty.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1989, 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)stty.c 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/bin/stty/stty.c,v 1.13.2.2 2001/07/04 22:40:00 kris Exp $ - * $DragonFly: src/bin/stty/stty.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/stty/stty.c,v 1.3 2003/09/21 04:26:26 drhodus Exp $ */ #include @@ -50,7 +50,7 @@ #include "stty.h" #include "extern.h" -int main __P((int, char *[])); +int main (int, char *[]); int main(argc, argv) diff --git a/bin/sync/sync.c b/bin/sync/sync.c index a15ae948ab..9773c3dfd8 100644 --- a/bin/sync/sync.c +++ b/bin/sync/sync.c @@ -33,13 +33,13 @@ * @(#) Copyright (c) 1987, 1993 The Regents of the University of California. All rights reserved. * @(#)sync.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/sync/sync.c,v 1.9.2.2 2001/08/01 05:43:30 obrien Exp $ - * $DragonFly: src/bin/sync/sync.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/sync/sync.c,v 1.3 2003/09/21 04:26:45 drhodus Exp $ */ #include #include -int main __P((void)); +int main (void); int main() diff --git a/bin/test/test.c b/bin/test/test.c index 89ae9ea9b2..7e292739fc 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -10,7 +10,7 @@ * This program is in the Public Domain. * * $FreeBSD: src/bin/test/test.c,v 1.29.2.7 2002/09/10 09:10:57 maxim Exp $ - * $DragonFly: src/bin/test/test.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/test/test.c,v 1.3 2003/09/21 04:27:16 drhodus Exp $ */ #include @@ -173,21 +173,21 @@ struct t_op const *t_wp_op; int nargc; char **t_wp; -static int aexpr __P((enum token)); -static int binop __P((void)); -static int equalf __P((const char *, const char *)); -static int filstat __P((char *, enum token)); -static int getn __P((const char *)); -static quad_t getq __P((const char *)); -static int intcmp __P((const char *, const char *)); -static int isoperand __P((void)); -static int newerf __P((const char *, const char *)); -static int nexpr __P((enum token)); -static int oexpr __P((enum token)); -static int olderf __P((const char *, const char *)); -static int primary __P((enum token)); -static void syntax __P((const char *, const char *)); -static enum token t_lex __P((char *)); +static int aexpr (enum token); +static int binop (void); +static int equalf (const char *, const char *); +static int filstat (char *, enum token); +static int getn (const char *); +static quad_t getq (const char *); +static int intcmp (const char *, const char *); +static int isoperand (void); +static int newerf (const char *, const char *); +static int nexpr (enum token); +static int oexpr (enum token); +static int olderf (const char *, const char *); +static int primary (enum token); +static void syntax (const char *, const char *); +static enum token t_lex (char *); int main(argc, argv) -- 2.41.0