o __P has been reoved

o Old-style K&R declarations have been converted to new C89 style
o register has been removed
o prototype for main() has been removed (gcc3 makes it an error)
o int main(int argc, char *argv[]) is the preferred main definition.
o Attempt to not break style(9) conformance for declarations more than
  they already are.
o Change
	int
	foo() {
	...
  to
	int
	foo(void)
	{
	...

1 files changed, 56 insertions, 104 deletions

diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 8d62830..f6a0a09 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -95,27 +95,27 @@ struct ifsregion ifsfirst;	/* first struct in list of ifs regions */
 struct ifsregion *ifslastp;	/* last struct in list */
 struct arglist exparg;		/* holds expanded arg list */
 
-STATIC void argstr __P((char *, int));
-STATIC char *exptilde __P((char *, int));
-STATIC void expbackq __P((union node *, int, int));
-STATIC int subevalvar __P((char *, char *, int, int, int, int));
-STATIC char *evalvar __P((char *, int));
-STATIC int varisset __P((char *, int));
-STATIC void varvalue __P((char *, int, int));
-STATIC void recordregion __P((int, int, int));
-STATIC void removerecordregions __P((int)); 
-STATIC void ifsbreakup __P((char *, struct arglist *));
-STATIC void expandmeta __P((struct strlist *, int));
-STATIC void expmeta __P((char *, char *));
-STATIC void addfname __P((char *));
-STATIC struct strlist *expsort __P((struct strlist *));
-STATIC struct strlist *msort __P((struct strlist *, int));
-STATIC int pmatch __P((char *, char *, int));
-STATIC char *cvtnum __P((int, char *));
-STATIC int collate_range_cmp __P((int, int));
-
-STATIC int collate_range_cmp (c1, c2)
-	int c1, c2;
+STATIC void argstr(char *, int);
+STATIC char *exptilde(char *, int);
+STATIC void expbackq(union node *, int, int);
+STATIC int subevalvar(char *, char *, int, int, int, int);
+STATIC char *evalvar(char *, int);
+STATIC int varisset(char *, int);
+STATIC void varvalue(char *, int, int);
+STATIC void recordregion(int, int, int);
+STATIC void removerecordregions(int); 
+STATIC void ifsbreakup(char *, struct arglist *);
+STATIC void expandmeta(struct strlist *, int);
+STATIC void expmeta(char *, char *);
+STATIC void addfname(char *);
+STATIC struct strlist *expsort(struct strlist *);
+STATIC struct strlist *msort(struct strlist *, int);
+STATIC int pmatch(char *, char *, int);
+STATIC char *cvtnum(int, char *);
+STATIC int collate_range_cmp(int, int);
+
+STATIC int
+collate_range_cmp (int c1, int c2)
 {
 	static char s1[2], s2[2];
 	int ret;
@@ -133,13 +133,13 @@ STATIC int collate_range_cmp (c1, c2)
 
 /*
  * Expand shell variables and backquotes inside a here document.
+ *	union node *arg		the document
+ *	int fd;			where to write the expanded version
  */
 
 void
-expandhere(arg, fd)
-	union node *arg;	/* the document */
-	int fd;			/* where to write the expanded version */
-	{
+expandhere(union node *arg, int fd)
+{
 	herefd = fd;
 	expandarg(arg, (struct arglist *)NULL, 0);
 	xwrite(fd, stackblock(), expdest - stackblock());
@@ -154,10 +154,7 @@ expandhere(arg, fd)
  */
 
 void
-expandarg(arg, arglist, flag)
-	union node *arg;
-	struct arglist *arglist;
-	int flag;
+expandarg(union node *arg, struct arglist *arglist, int flag)
 {
 	struct strlist *sp;
 	char *p;
@@ -213,9 +210,7 @@ expandarg(arg, arglist, flag)
  */
 
 STATIC void
-argstr(p, flag)
-	char *p;
-	int flag;
+argstr(char *p, int flag)
 {
 	char c;
 	int quotes = flag & (EXP_FULL | EXP_CASE);	/* do CTLESC */
@@ -277,9 +272,7 @@ breakloop:;
 }
 
 STATIC char *
-exptilde(p, flag)
-	char *p;
-	int flag;
+exptilde(char *p, int flag)
 {
 	char c, *startp = p;
 	struct passwd *pw;
@@ -327,8 +320,7 @@ lose:
 
 
 STATIC void 
-removerecordregions(endoff)
-	int endoff;
+removerecordregions(int endoff)
 {
 	if (ifslastp == NULL)
 		return;
@@ -371,8 +363,7 @@ removerecordregions(endoff)
  * evaluate, place result in (backed up) result, adjust string position.
  */
 void
-expari(flag)
-	int flag;
+expari(int flag)
 {
 	char *p, *start;
 	int result;
@@ -431,10 +422,7 @@ expari(flag)
  */
 
 STATIC void
-expbackq(cmd, quoted, flag)
-	union node *cmd;
-	int quoted;
-	int flag;
+expbackq(union node *cmd, int quoted, int flag)
 {
 	struct backcmd in;
 	int i;
@@ -507,13 +495,8 @@ expbackq(cmd, quoted, flag)
 
 
 STATIC int
-subevalvar(p, str, strloc, subtype, startloc, varflags)
-	char *p;
-	char *str;
-	int strloc;
-	int subtype;
-	int startloc;
-	int varflags;
+subevalvar(char *p, char *str, int strloc, int subtype, int startloc,
+  int varflags)
 {
 	char *startp;
 	char *loc = NULL;
@@ -638,9 +621,7 @@ recordleft:
  */
 
 STATIC char *
-evalvar(p, flag)
-	char *p;
-	int flag;
+evalvar(char *p, int flag)
 {
 	int subtype;
 	int varflags;
@@ -804,9 +785,7 @@ record:
  */
 
 STATIC int
-varisset(name, nulok)
-	char *name;
-	int nulok;
+varisset(char *name, int nulok)
 {
 
 	if (*name == '!')
@@ -848,10 +827,7 @@ varisset(name, nulok)
  */
 
 STATIC void
-varvalue(name, quoted, allow_split)
-	char *name;
-	int quoted;
-	int allow_split;
+varvalue(char *name, int quoted, int allow_split)
 {
 	int num;
 	char *p;
@@ -942,10 +918,7 @@ numvar:
  */
 
 STATIC void
-recordregion(start, end, nulonly)
-	int start;
-	int end;
-	int nulonly;
+recordregion(int start, int end, int nulonly)
 {
 	struct ifsregion *ifsp;
 
@@ -970,10 +943,8 @@ recordregion(start, end, nulonly)
  * searched for IFS characters have been stored by recordregion.
  */
 STATIC void
-ifsbreakup(string, arglist)
-	char *string;
-	struct arglist *arglist;
-	{
+ifsbreakup(char *string, struct arglist *arglist)
+{
 	struct ifsregion *ifsp;
 	struct strlist *sp;
 	char *start;
@@ -1068,9 +1039,7 @@ char *expdir;
 
 
 STATIC void
-expandmeta(str, flag)
-	struct strlist *str;
-	int flag __unused;
+expandmeta(struct strlist *str, int flag __unused)
 {
 	char *p;
 	struct strlist **savelastp;
@@ -1124,10 +1093,8 @@ nometa:
  */
 
 STATIC void
-expmeta(enddir, name)
-	char *enddir;
-	char *name;
-	{
+expmeta(char *enddir, char *name)
+{
 	char *p;
 	char *q;
 	char *start;
@@ -1255,9 +1222,8 @@ expmeta(enddir, name)
  */
 
 STATIC void
-addfname(name)
-	char *name;
-	{
+addfname(char *name)
+{
 	char *p;
 	struct strlist *sp;
 
@@ -1277,9 +1243,8 @@ addfname(name)
  */
 
 STATIC struct strlist *
-expsort(str)
-	struct strlist *str;
-	{
+expsort(struct strlist *str)
+{
 	int len;
 	struct strlist *sp;
 
@@ -1291,9 +1256,7 @@ expsort(str)
 
 
 STATIC struct strlist *
-msort(list, len)
-	struct strlist *list;
-	int len;
+msort(struct strlist *list, int len)
 {
 	struct strlist *p, *q = NULL;
 	struct strlist **lpp;
@@ -1339,11 +1302,8 @@ msort(list, len)
  */
 
 int
-patmatch(pattern, string, squoted)
-	char *pattern;
-	char *string;
-	int squoted;	/* string might have quote chars */
-	{
+patmatch(char *pattern, char *string, int squoted)
+{
 #ifdef notdef
 	if (pattern[0] == '!' && pattern[1] == '!')
 		return 1 - pmatch(pattern + 2, string);
@@ -1354,11 +1314,8 @@ patmatch(pattern, string, squoted)
 
 
 STATIC int
-pmatch(pattern, string, squoted)
-	char *pattern;
-	char *string;
-	int squoted;
-	{
+pmatch(char *pattern, char *string, int squoted)
+{
 	char *p, *q;
 	char c;
 
@@ -1482,8 +1439,7 @@ breakloop:
  */
 
 void
-rmescapes(str)
-	char *str;
+rmescapes(char *str)
 {
 	char *p, *q;
 
@@ -1512,10 +1468,8 @@ rmescapes(str)
  */
 
 int
-casematch(pattern, val)
-	union node *pattern;
-	char *val;
-	{
+casematch(union node *pattern, char *val)
+{
 	struct stackmark smark;
 	int result;
 	char *p;
@@ -1537,10 +1491,8 @@ casematch(pattern, val)
  */
 
 STATIC char *
-cvtnum(num, buf)
-	int num;
-	char *buf;
-	{
+cvtnum(int num, char *buf)
+{
 	char temp[32];
 	int neg = num < 0;
 	char *p = temp + 31;