6309237 gcc and libbc don't get along

17 files changed, 70 insertions, 88 deletions

diff --git a/usr/src/lib/libbc/libc/sys/sys5/chdir.c b/usr/src/lib/libbc/libc/sys/sys5/chdir.c
index 8de4004424..3bb3ea864a 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/chdir.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/chdir.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-chdir(s)
-    char           *s;
+int
+chdir(char *s)
 {
-    return _syscall(SYS_chdir, s);
+    return (_syscall(SYS_chdir, s));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/chmod.c b/usr/src/lib/libbc/libc/sys/sys5/chmod.c
index 06d184581a..0116dc7aab 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/chmod.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/chmod.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-chmod(s, m)
-    char           *s;
+int
+chmod(char *s, int m)
 {
-    return _syscall(SYS_chmod, s, m);
+    return (_syscall(SYS_chmod, s, m));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/chown.c b/usr/src/lib/libbc/libc/sys/sys5/chown.c
index 696112e3ff..ec2daf5b05 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/chown.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/chown.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-chown(s, u, g)
-    char           *s;
+int
+chown(char *s, int u, int g)
 {
-    return _syscall(SYS_lchown, s, u, g);
+    return (_syscall(SYS_lchown, s, u, g));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/chroot.c b/usr/src/lib/libbc/libc/sys/sys5/chroot.c
index 419393b170..b52aac898c 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/chroot.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/chroot.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-chroot(d)
-    char           *d;
+int
+chroot(char *d)
 {
-    return _syscall(SYS_chroot, d);
+    return (_syscall(SYS_chroot, d));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/execve.c b/usr/src/lib/libbc/libc/sys/sys5/execve.c
index bf86229015..476505107b 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/execve.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/execve.c
@@ -30,9 +30,8 @@
 #include <sys/file.h>
 #include <sys/syscall.h>
 
-execve(file, argv, arge)
-char *file;
-char **argv, **arge;
+int
+execve(char *file, char **argv, char **arge)
 {
 	char *c;
 	char path[256];
@@ -64,5 +63,5 @@ char **argv, **arge;
 		}
 	}
 	
-	return(_syscall(SYS_execve, file, argv, arge));
+	return (_syscall(SYS_execve, file, argv, arge));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/getgroups.c b/usr/src/lib/libbc/libc/sys/sys5/getgroups.c
index d4c64d4b2c..5351a9d504 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/getgroups.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/getgroups.c
@@ -24,25 +24,24 @@
  * Use is subject to license terms.
  */
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 /*
  * POSIX.1 compatible getgroups() routine
  * This is needed while gid_t is not the same size as int (or whatever the
  * syscall is using at the time).
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syscall.h>
 
-getgroups(gidsetsize, grouplist)
-int	gidsetsize;
-gid_t	grouplist[];
+int
+getgroups(int gidsetsize, gid_t grouplist[])
 {
 	int	glist[NGROUPS];	/* getgroups() syscall returns ints */
-	register int	i;	/* loop control */
-	register int	rc;	/* return code hold area */
+	int	i;	/* loop control */
+	int	rc;	/* return code hold area */
 
 	rc = _syscall(SYS_getgroups, gidsetsize, glist);
 	if (rc > 0 && gidsetsize != 0)
diff --git a/usr/src/lib/libbc/libc/sys/sys5/link.c b/usr/src/lib/libbc/libc/sys/sys5/link.c
index 11cad8f463..5025510281 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/link.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/link.c
@@ -28,9 +28,8 @@
 
 #include <sys/syscall.h>
 
-link(a, b)
-    char           *a;
-    char           *b;
+int
+link(char *a, char *b)
 {
-    return _syscall(SYS_link, a, b);
+    return (_syscall(SYS_link, a, b));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/mkdir.c b/usr/src/lib/libbc/libc/sys/sys5/mkdir.c
index 71c6275fba..87fa580398 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/mkdir.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/mkdir.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-mkdir(p, m)
-    char           *p;
+int
+mkdir(char *p, int m)
 {
-    return _syscall(SYS_mkdir, p, m);
+    return (_syscall(SYS_mkdir, p, m));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/mkfifo.c b/usr/src/lib/libbc/libc/sys/sys5/mkfifo.c
index 7745f0ba91..e5ecd5d999 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/mkfifo.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/mkfifo.c
@@ -24,14 +24,13 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-mkfifo(path, mode)
-	char *path;
-	mode_t mode;
+int
+mkfifo(char *path, mode_t mode)
 {
-	return mknod(path, S_IFIFO | (mode & (S_IRWXU|S_IRWXG|S_IRWXO)));
+	return (mknod(path, S_IFIFO | (mode & (S_IRWXU|S_IRWXG|S_IRWXO))));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/mknod.c b/usr/src/lib/libbc/libc/sys/sys5/mknod.c
index 1fef5217eb..4346b9ab05 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/mknod.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/mknod.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * If we're asked to make a directory, do a "mkdir" instead, so we meet
@@ -36,13 +36,9 @@
 #include <errno.h>
 
 extern int _mknod();
-extern int mkdir();
 
 int
-mknod(path, mode, dev)
-	char *path;
-	int mode;
-	int dev;
+mknod(char *path, int mode, int dev)
 {
 	if ((mode & S_IFMT) == S_IFDIR)
 		if (geteuid()) {
diff --git a/usr/src/lib/libbc/libc/sys/sys5/open.c b/usr/src/lib/libbc/libc/sys/sys5/open.c
index e6a0a529a9..9a5b30d765 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/open.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/open.c
@@ -24,25 +24,20 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
-#include <sys/errno.h>
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-extern int errno;
+#include <errno.h>
 
-open(path, flags, mode)
-    char           *path;
-    int            flags;
-    int		   mode;
+
+int
+open(char *path, int flags, int mode)
 {
     return (bc_open(path, flags, mode));
 }
 
 
-
-bc_open(path, flags, mode)
-    char           *path;
-    int            flags;
-    int		   mode;
+int
+bc_open(char *path, int flags, int mode)
 {
     if ((path == (char*)0) || (path == (char*) -1)) {
 	errno = EFAULT;
@@ -50,4 +45,3 @@ bc_open(path, flags, mode)
     }
     return (open_com(path, flags, mode));
 }
-
diff --git a/usr/src/lib/libbc/libc/sys/sys5/pathconf.c b/usr/src/lib/libbc/libc/sys/sys5/pathconf.c
index 94477894f3..f14a00b6ba 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/pathconf.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/pathconf.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-pathconf(p, what)
-    char* p;
+int
+pathconf(char *p, int what)
 {
-    return _syscall(SYS_pathconf, p, what);
+    return (_syscall(SYS_pathconf, p, what));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/readlink.c b/usr/src/lib/libbc/libc/sys/sys5/readlink.c
index 3182902f03..48e3a692be 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/readlink.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/readlink.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-readlink(p, b, s)
-    char           *p, *b;
+int
+readlink(char *p, char *b, int s)
 {
-    return _syscall(SYS_readlink, p, b, s);
+    return (_syscall(SYS_readlink, p, b, s));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/rmdir.c b/usr/src/lib/libbc/libc/sys/sys5/rmdir.c
index 2f859bcfd1..8c6d49e47e 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/rmdir.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/rmdir.c
@@ -24,15 +24,13 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-rmdir(d)
-    char           *d;
+int
+rmdir(char *d)
 {
-	int ret;
-	extern errno;
 
-	return(_syscall(SYS_rmdir, d));
+	return (_syscall(SYS_rmdir, d));
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/setgroups.c b/usr/src/lib/libbc/libc/sys/sys5/setgroups.c
index a9f3cb210e..689d0165bd 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/setgroups.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/setgroups.c
@@ -24,25 +24,24 @@
  * Use is subject to license terms.
  */
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 /*
  * POSIX.1 compatible setgroups() routine
  * This is needed while gid_t is not the same size as int (or whatever the
  * syscall is using at the time).
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
-
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syscall.h>
 
-setgroups(ngroups, grouplist)
-int	ngroups;
-gid_t	grouplist[];
+int
+setgroups(int ngroups, gid_t grouplist[])
 {
 	int	glist[NGROUPS];	/* setgroups() syscall expects ints */
-	register int	i;	/* loop control */
+	int	i;	/* loop control */
 
 	if (ngroups > NGROUPS) {
 		errno = EINVAL;
diff --git a/usr/src/lib/libbc/libc/sys/sys5/statfs.c b/usr/src/lib/libbc/libc/sys/sys5/statfs.c
index 7b597f49c4..b2d663c20b 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/statfs.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/statfs.c
@@ -24,14 +24,13 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
 #include <sys/vfs.h>
 
-statfs(s, b)
-    char            *s;
-    struct statfs *b;
+int
+statfs(char *s, struct statfs *b)
 {
-	return(statfs_com(s, b));		
+	return (statfs_com(s, b));		
 }
diff --git a/usr/src/lib/libbc/libc/sys/sys5/symlink.c b/usr/src/lib/libbc/libc/sys/sys5/symlink.c
index 0d1768f546..666b3b44e2 100644
--- a/usr/src/lib/libbc/libc/sys/sys5/symlink.c
+++ b/usr/src/lib/libbc/libc/sys/sys5/symlink.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/syscall.h>
 
-symlink(t, f)
-    char           *t, *f;
+int
+symlink(char *t, char *f)
 {
-    return _syscall(SYS_symlink, t, f);
+    return (_syscall(SYS_symlink, t, f));
 }