Skip to content

Commit

Permalink
Part one of userland __P removal. Done with a simple regexp with some…
Browse files Browse the repository at this point in the history 
… minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.
  • Loading branch information
millert committed Feb 16, 2002
1 parent 9e05729 commit c72b5b2
Show file tree
Hide file tree
Showing 1,328 changed files with 14,384 additions and 14,384 deletions.
12 changes: 6 additions & 6 deletions bin/cat/cat.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: cat.c,v 1.11 2001/11/05 07:39:16 mpech Exp $ */
/* $OpenBSD: cat.c,v 1.12 2002/02/16 21:27:05 millert Exp $ */
/* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */

/*
Expand Down Expand Up @@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
#else
static char rcsid[] = "$OpenBSD: cat.c,v 1.11 2001/11/05 07:39:16 mpech Exp $";
static char rcsid[] = "$OpenBSD: cat.c,v 1.12 2002/02/16 21:27:05 millert Exp $";
#endif
#endif /* not lint */

Expand All @@ -70,10 +70,10 @@ int bflag, eflag, nflag, sflag, tflag, vflag;
int rval;
char *filename;

void cook_args __P((char *argv[]));
void cook_buf __P((FILE *));
void raw_args __P((char *argv[]));
void raw_cat __P((int));
void cook_args(char *argv[]);
void cook_buf(FILE *);
void raw_args(char *argv[]);
void raw_cat(int);

int
main(argc, argv)
Expand Down
32 changes: 16 additions & 16 deletions bin/chio/chio.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: chio.c,v 1.9 2001/03/21 22:23:58 art Exp $ */
/* $OpenBSD: chio.c,v 1.10 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: chio.c,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $ */

/*
Expand Down Expand Up @@ -50,21 +50,21 @@

extern char *__progname; /* from crt0.o */

static void usage __P((void));
static void cleanup __P((void));
static int parse_element_type __P((char *));
static int parse_element_unit __P((char *));
static int parse_special __P((char *));
static int is_special __P((char *));
static char *bits_to_string __P((int, const char *));

static int do_move __P((char *, int, char **));
static int do_exchange __P((char *, int, char **));
static int do_position __P((char *, int, char **));
static int do_params __P((char *, int, char **));
static int do_getpicker __P((char *, int, char **));
static int do_setpicker __P((char *, int, char **));
static int do_status __P((char *, int, char **));
static void usage(void);
static void cleanup(void);
static int parse_element_type(char *);
static int parse_element_unit(char *);
static int parse_special(char *);
static int is_special(char *);
static char *bits_to_string(int, const char *);

static int do_move(char *, int, char **);
static int do_exchange(char *, int, char **);
static int do_position(char *, int, char **);
static int do_params(char *, int, char **);
static int do_getpicker(char *, int, char **);
static int do_setpicker(char *, int, char **);
static int do_status(char *, int, char **);

/* Valid changer element types. */
const struct element_type elements[] = {
Expand Down
4 changes: 2 additions & 2 deletions bin/chio/defs.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: defs.h,v 1.3 1997/11/08 23:22:41 todd Exp $ */
/* $OpenBSD: defs.h,v 1.4 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: defs.h,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $ */

/*
Expand Down Expand Up @@ -41,7 +41,7 @@ struct element_type {
struct changer_command {
char *cc_name; /* command name */
/* command handler */
int (*cc_handler) __P((char *, int, char **));
int (*cc_handler)(char *, int, char **);
};

struct special_word {
Expand Down
10 changes: 5 additions & 5 deletions bin/chmod/chmod.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $ */
/* $OpenBSD: chmod.c,v 1.13 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: chmod.c,v 1.12 1995/03/21 09:02:09 cgd Exp $ */

/*
Expand Down Expand Up @@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94";
#else
static char rcsid[] = "$OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $";
static char rcsid[] = "$OpenBSD: chmod.c,v 1.13 2002/02/16 21:27:06 millert Exp $";
#endif
#endif /* not lint */

Expand All @@ -66,9 +66,9 @@ static char rcsid[] = "$OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $"
int ischflags, ischown, ischgrp, ischmod;
extern char *__progname;

gid_t a_gid __P((const char *));
uid_t a_uid __P((const char *));
void usage __P((void));
gid_t a_gid(const char *);
uid_t a_uid(const char *);
void usage(void);

int
main(argc, argv)
Expand Down
10 changes: 5 additions & 5 deletions bin/cp/cp.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: cp.c,v 1.17 2001/06/25 04:35:31 art Exp $ */
/* $OpenBSD: cp.c,v 1.18 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */

/*
Expand Down Expand Up @@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95";
#else
static char rcsid[] = "$OpenBSD: cp.c,v 1.17 2001/06/25 04:35:31 art Exp $";
static char rcsid[] = "$OpenBSD: cp.c,v 1.18 2002/02/16 21:27:06 millert Exp $";
#endif
#endif /* not lint */

Expand Down Expand Up @@ -97,9 +97,9 @@ int myumask;

enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };

int copy __P((char *[], enum op, int));
int mastercmp __P((const FTSENT **, const FTSENT **));
char *find_last_component __P((char *));
int copy(char *[], enum op, int);
int mastercmp(const FTSENT **, const FTSENT **);
char *find_last_component(char *);

int
main(argc, argv)
Expand Down
16 changes: 8 additions & 8 deletions bin/cp/extern.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: extern.h,v 1.8 2001/09/06 13:29:08 mpech Exp $ */
/* $OpenBSD: extern.h,v 1.9 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: extern.h,v 1.3 1995/03/21 09:02:16 cgd Exp $ */

/*-
Expand Down Expand Up @@ -50,11 +50,11 @@ extern char *__progname;
#include <sys/cdefs.h>

__BEGIN_DECLS
int copy_fifo __P((struct stat *, int));
int copy_file __P((FTSENT *, int));
int copy_link __P((FTSENT *, int));
int copy_special __P((struct stat *, int));
int setfile __P((struct stat *, int));
int setlink __P((struct stat *));
void usage __P((void));
int copy_fifo(struct stat *, int);
int copy_file(FTSENT *, int);
int copy_link(FTSENT *, int);
int copy_special(struct stat *, int);
int setfile(struct stat *, int);
int setlink(struct stat *);
void usage(void);
__END_DECLS
24 changes: 12 additions & 12 deletions bin/csh/csh.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: csh.c,v 1.14 2001/06/22 21:07:35 deraadt Exp $ */
/* $OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */

/*-
Expand Down Expand Up @@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
static char rcsid[] = "$OpenBSD: csh.c,v 1.14 2001/06/22 21:07:35 deraadt Exp $";
static char rcsid[] = "$OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $";
#endif
#endif /* not lint */

Expand Down Expand Up @@ -104,16 +104,16 @@ bool tellwhat = 0;

extern char **environ;

static int readf __P((void *, char *, int));
static fpos_t seekf __P((void *, fpos_t, int));
static int writef __P((void *, const char *, int));
static int closef __P((void *));
static int srccat __P((Char *, Char *));
static int srcfile __P((char *, bool, bool));
static void phup __P((int));
static void srcunit __P((int, bool, bool));
static void mailchk __P((void));
static Char **defaultpath __P((void));
static int readf(void *, char *, int);
static fpos_t seekf(void *, fpos_t, int);
static int writef(void *, const char *, int);
static int closef(void *);
static int srccat(Char *, Char *);
static int srcfile(char *, bool, bool);
static void phup(int);
static void srcunit(int, bool, bool);
static void mailchk(void);
static Char **defaultpath(void);

int
main(argc, argv)
Expand Down
4 changes: 2 additions & 2 deletions bin/csh/csh.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: csh.h,v 1.7 2000/10/30 17:16:46 millert Exp $ */
/* $OpenBSD: csh.h,v 1.8 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $ */

/*-
Expand Down Expand Up @@ -360,7 +360,7 @@ struct command {

extern struct biltins {
char *bname;
void (*bfunct) __P((Char **, struct command *));
void (*bfunct)(Char **, struct command *);
short minargs, maxargs;
} bfunc[];
extern int nbfunc;
Expand Down
16 changes: 8 additions & 8 deletions bin/csh/dir.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $ */
/* $OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */

/*-
Expand Down Expand Up @@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93";
#else
static char rcsid[] = "$OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $";
static char rcsid[] = "$OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $";
#endif
#endif /* not lint */

Expand All @@ -61,12 +61,12 @@ static char rcsid[] = "$OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $";
/* Directory management. */

static struct directory
*dfind __P((Char *));
static Char *dfollow __P((Char *));
static void printdirs __P((void));
static Char *dgoto __P((Char *));
static void dnewcwd __P((struct directory *));
static void dset __P((Char *));
*dfind(Char *);
static Char *dfollow(Char *);
static void printdirs(void);
static Char *dgoto(Char *);
static void dnewcwd(struct directory *);
static void dset(Char *);

struct directory dhead; /* "head" of loop */
int printd; /* force name to be printed */
Expand Down
26 changes: 13 additions & 13 deletions bin/csh/dol.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: dol.c,v 1.7 2002/02/01 02:15:01 itojun Exp $ */
/* $OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */

/*-
Expand Down Expand Up @@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
#else
static char rcsid[] = "$OpenBSD: dol.c,v 1.7 2002/02/01 02:15:01 itojun Exp $";
static char rcsid[] = "$OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $";
#endif
#endif /* not lint */

Expand Down Expand Up @@ -91,17 +91,17 @@ static int dolnmod; /* Number of modifiers */
static int dolmcnt; /* :gx -> 10000, else 1 */
static int dolwcnt; /* :wx -> 10000, else 1 */

static void Dfix2 __P((Char **));
static Char *Dpack __P((Char *, Char *));
static int Dword __P((void));
static void dolerror __P((Char *));
static int DgetC __P((int));
static void Dgetdol __P((void));
static void fixDolMod __P((void));
static void setDolp __P((Char *));
static void unDredc __P((int));
static int Dredc __P((void));
static void Dtestq __P((int));
static void Dfix2(Char **);
static Char *Dpack(Char *, Char *);
static int Dword(void);
static void dolerror(Char *);
static int DgetC(int);
static void Dgetdol(void);
static void fixDolMod(void);
static void setDolp(Char *);
static void unDredc(int);
static int Dredc(void);
static void Dtestq(int);


/*
Expand Down
16 changes: 8 additions & 8 deletions bin/csh/exec.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: exec.c,v 1.7 1998/05/18 20:38:19 deraadt Exp $ */
/* $OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */

/*-
Expand Down Expand Up @@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
#else
static char rcsid[] = "$OpenBSD: exec.c,v 1.7 1998/05/18 20:38:19 deraadt Exp $";
static char rcsid[] = "$OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $";
#endif
#endif /* not lint */

Expand Down Expand Up @@ -104,12 +104,12 @@ static int hits, misses;
/* Dummy search path for just absolute search when no path */
static Char *justabs[] = {STRNULL, 0};

static void pexerr __P((void));
static void texec __P((Char *, Char **));
static int hashname __P((Char *));
static int tellmewhat __P((struct wordent *, Char *));
static int executable __P((Char *, Char *, bool));
static int iscommand __P((Char *));
static void pexerr(void);
static void texec(Char *, Char **);
static int hashname(Char *);
static int tellmewhat(struct wordent *, Char *);
static int executable(Char *, Char *, bool);
static int iscommand(Char *);


void
Expand Down
34 changes: 17 additions & 17 deletions bin/csh/exp.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $ */
/* $OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */
/* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */

/*-
Expand Down Expand Up @@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93";
#else
static char rcsid[] = "$OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $";
static char rcsid[] = "$OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $";
#endif
#endif /* not lint */

Expand Down Expand Up @@ -75,23 +75,23 @@ static char rcsid[] = "$OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $";
#define EQMATCH 7
#define NOTEQMATCH 8

static int exp1 __P((Char ***, bool));
static int exp2 __P((Char ***, bool));
static int exp2a __P((Char ***, bool));
static int exp2b __P((Char ***, bool));
static int exp2c __P((Char ***, bool));
static Char * exp3 __P((Char ***, bool));
static Char * exp3a __P((Char ***, bool));
static Char * exp4 __P((Char ***, bool));
static Char * exp5 __P((Char ***, bool));
static Char * exp6 __P((Char ***, bool));
static void evalav __P((Char **));
static int isa __P((Char *, int));
static int egetn __P((Char *));
static int exp1(Char ***, bool);
static int exp2(Char ***, bool);
static int exp2a(Char ***, bool);
static int exp2b(Char ***, bool);
static int exp2c(Char ***, bool);
static Char * exp3(Char ***, bool);
static Char * exp3a(Char ***, bool);
static Char * exp4(Char ***, bool);
static Char * exp5(Char ***, bool);
static Char * exp6(Char ***, bool);
static void evalav(Char **);
static int isa(Char *, int);
static int egetn(Char *);

#ifdef EDEBUG
static void etracc __P((char *, Char *, Char ***));
static void etraci __P((char *, int, Char ***));
static void etracc(char *, Char *, Char ***);
static void etraci(char *, int, Char ***);
#endif

int
Expand Down
Loading

0 comments on commit c72b5b2

Please sign in to comment.