From eaecbf33f70c0eed2f9a60b392e5782e03a9be2f Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 31 Oct 2001 10:41:31 +0000
Subject: [PATCH] Fixup some silly prototype warnings

---
 coreutils/expr.c        | 12 ++++++------
 coreutils/tr.c          |  2 +-
 shell/hush.c            |  6 +++---
 util-linux/mkfs_minix.c |  4 +---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/coreutils/expr.c b/coreutils/expr.c
index d6cc82e3e..0299cc73a 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -194,7 +194,7 @@ nextarg (char *str)
 /* The comparison operator handling functions.  */
 
 #define cmpf(name, rel)					\
-static int name (l, r) VALUE *l; VALUE *r;		\
+static int name (VALUE *l, VALUE *r)		\
 {							\
 	if (l->type == string || r->type == string) {		\
 		tostring (l);				\
@@ -217,7 +217,7 @@ static int name (l, r) VALUE *l; VALUE *r;		\
 
 #define arithf(name, op)			\
 static						\
-int name (l, r) VALUE *l; VALUE *r;		\
+int name (VALUE *l, VALUE *r)		\
 {						\
   if (!toarith (l) || !toarith (r))		\
     error_msg_and_die ("non-numeric argument");	\
@@ -225,7 +225,7 @@ int name (l, r) VALUE *l; VALUE *r;		\
 }
 
 #define arithdivf(name, op)			\
-static int name (l, r) VALUE *l; VALUE *r;		\
+static int name (VALUE *l, VALUE *r)		\
 {						\
   if (!toarith (l) || !toarith (r))		\
     error_msg_and_die ( "non-numeric argument");	\
@@ -414,7 +414,7 @@ static VALUE *eval5 (void)
 static VALUE *eval4 (void)
 {
 	VALUE *l, *r;
-	int (*fxn) (), val;
+	int (*fxn) (VALUE *, VALUE *), val;
 
 	l = eval5 ();
 	while (1) {
@@ -440,7 +440,7 @@ static VALUE *eval4 (void)
 static VALUE *eval3 (void)
 {
 	VALUE *l, *r;
-	int (*fxn) (), val;
+	int (*fxn) (VALUE *, VALUE *), val;
 
 	l = eval4 ();
 	while (1) {
@@ -464,7 +464,7 @@ static VALUE *eval3 (void)
 static VALUE *eval2 (void)
 {
 	VALUE *l, *r;
-	int (*fxn) (), val;
+	int (*fxn) (VALUE *, VALUE *), val;
 
 	l = eval3 ();
 	while (1) {
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 2665d926f..e2a4ef6c5 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -44,7 +44,7 @@ static unsigned char *pvector;
 static char *pinvec, *poutvec;
 
 
-static void convert()
+static void convert(void)
 {
 	short read_chars = 0;
 	short c, coded;
diff --git a/shell/hush.c b/shell/hush.c
index 195013869..27afd3e7c 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -349,7 +349,7 @@ static void setup_string_in_str(struct in_str *i, const char *s);
 /*  close_me manipulations: */
 static void mark_open(int fd);
 static void mark_closed(int fd);
-static void close_all();
+static void close_all(void);
 /*  "run" the final data structures: */
 static char *indenter(int i);
 static int free_pipe_list(struct pipe *head, int indent);
@@ -975,7 +975,7 @@ static void mark_closed(int fd)
 	free(tmp);
 }
 
-static void close_all()
+static void close_all(void)
 {
 	struct close_me *c;
 	for (c=close_me_head; c; c=c->next) {
@@ -2547,7 +2547,7 @@ static int parse_file_outer(FILE *f)
 /* Make sure we have a controlling tty.  If we get started under a job
  * aware app (like bash for example), make sure we are now in charge so
  * we don't fight over who gets the foreground */
-static void setup_job_control()
+static void setup_job_control(void)
 {
 	static pid_t shell_pgrp;
 	/* Loop until we are in the foreground.  */
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index a388d0ab0..fb9aeea38 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -670,9 +670,7 @@ static void check_blocks(void)
 		printf("one bad block\n");
 }
 
-static void get_list_blocks(filename)
-char *filename;
-
+static void get_list_blocks(char *filename)
 {
 	FILE *listfile;
 	unsigned long blockno;