From 2fb7e51de7d17ebb9ebdbd1863b150f5ba7a44de Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Mon, 16 Mar 2009 02:00:39 +0000
Subject: [PATCH] DEVEL15-util-prototypes-20090315

LICENSE IPL10
FIXES 124247

prototype the util directory


(cherry picked from commit 47451b4c2009c51160686b4aca1b28b7011ba92f)
---
 src/util/fstab.c | 26 ++++++++++++--------------
 src/util/regex.c |  8 ++++----
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/util/fstab.c b/src/util/fstab.c
index 6b6a67c1c..2ddefe55f 100644
--- a/src/util/fstab.c
+++ b/src/util/fstab.c
@@ -79,11 +79,11 @@ static struct statfs *_fs_buf;
 static struct statfs *_fs_ptr;
 static int _fs_count;
 
-static error __P((int));
-static fstabscan __P((void));
+static void error(int);
+static int fstabscan(void);
 
-static
-fstabscan()
+static int
+fstabscan(void)
 {
     if (_fs_count <= 0)
 	return (0);
@@ -101,7 +101,7 @@ fstabscan()
 }
 
 struct fstab *
-getfsent()
+getfsent(void)
 {
     if (!_fs_buf && !setfsent() || !fstabscan())
 	return ((struct fstab *)NULL);
@@ -109,8 +109,7 @@ getfsent()
 }
 
 struct fstab *
-getfsspec(name)
-     register const char *name;
+getfsspec(const char *name)
 {
     if (setfsent())
 	while (fstabscan())
@@ -120,8 +119,7 @@ getfsspec(name)
 }
 
 struct fstab *
-getfsfile(name)
-     register const char *name;
+getfsfile(const char *name)
 {
     if (setfsent())
 	while (fstabscan())
@@ -130,7 +128,8 @@ getfsfile(name)
     return ((struct fstab *)NULL);
 }
 
-setfsent()
+int
+setfsent(void)
 {
     long bufsize;
 
@@ -156,7 +155,7 @@ setfsent()
 }
 
 void
-endfsent()
+endfsent(void)
 {
     if (_fs_buf) {
 	free(_fs_buf);
@@ -165,9 +164,8 @@ endfsent()
     _fs_count = 0;
 }
 
-static
-error(err)
-     int err;
+static void
+error(int err)
 {
     char *p;
 
diff --git a/src/util/regex.c b/src/util/regex.c
index 8d48678a2..2cc61f921 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -258,7 +258,7 @@ re_exec(register char *p1)
 	do {
 	    if (*p1 != c)
 		continue;
-	    if (rv = advance(p1, p2))
+	    if ((rv = advance(p1, p2)))
 		return (rv);
 	} while (*p1++);
 	return (0);
@@ -267,7 +267,7 @@ re_exec(register char *p1)
      * regular algorithm
      */
     do
-	if (rv = advance(p1, p2))
+	if ((rv = advance(p1, p2)))
 	    return (rv);
     while (*p1++);
     return (0);
@@ -343,7 +343,7 @@ advance(register char *lp, register char *ep)
 	    while (backref(i, lp))
 		lp += ct;
 	    while (lp >= curlp) {
-		if (rv = advance(lp, ep))
+		if ((rv = advance(lp, ep)))
 		    return (rv);
 		lp -= ct;
 	    }
@@ -370,7 +370,7 @@ advance(register char *lp, register char *ep)
 	  star:
 	    do {
 		lp--;
-		if (rv = advance(lp, ep))
+		if ((rv = advance(lp, ep)))
 		    return (rv);
 	    } while (lp > curlp);
 	    return (0);
-- 
2.39.5