ANSI fixes

SCCS-vsn: sbin/fsdb/fsdb.c 5.9
SCCS-vsn: sbin/reboot/halt.c 5.9
SCCS-vsn: sbin/mount/mount.c 5.44
SCCS-vsn: sbin/mountd/mountd.c 5.14
SCCS-vsn: sbin/newfs/mkfs.c 6.16

diff --git a/usr/src/sbin/fsdb/fsdb.c b/usr/src/sbin/fsdb/fsdb.c
index f469007..e4ff17a 100644 (file)
--- a/usr/src/sbin/fsdb/fsdb.c
+++ b/usr/src/sbin/fsdb/fsdb.c
@@ -15,7 +15,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)fsdb.c     5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)fsdb.c     5.9 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -212,7 +212,7 @@ jmp_buf             env;
 extern char    *malloc(), *calloc();
 char           getachar();
 char           *getblk(), *fmtentry();
 extern char    *malloc(), *calloc();
 char           getachar();
 char           *getblk(), *fmtentry();

-int            err();
+void           err();

 long           get(), bmap(), expr(), term(), getnumb();
 unsigned long  *print_check();
 
 long           get(), bmap(), expr(), term(), getnumb();
 unsigned long  *print_check();
 


@@ -2810,6 +2810,7 @@ insert(bp)
  *     appropriate flags.  A reset call is made to return
  *     to the main loop;
  */
  *     appropriate flags.  A reset call is made to return
  *     to the main loop;
  */

+void

 err()
 {
        freemem(filenames, nfiles);
 err()
 {
        freemem(filenames, nfiles);

diff --git a/usr/src/sbin/mount/mount.c b/usr/src/sbin/mount/mount.c
index ee3ff81..733ea1f 100644 (file)
--- a/usr/src/sbin/mount/mount.c
+++ b/usr/src/sbin/mount/mount.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)mount.c    5.43 (Berkeley) %G%";
+static char sccsid[] = "@(#)mount.c    5.44 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)mount.c   5.43 (Berkeley) %G%";
 int fake, verbose, updateflg, mnttype;
 char *mntname, **envp;
 char **vfslist, **makevfslist();
 int fake, verbose, updateflg, mnttype;
 char *mntname, **envp;
 char **vfslist, **makevfslist();

+static void prmount();

 
 #ifdef NFS
 int xdr_dir(), xdr_fh();
 
 #ifdef NFS
 int xdr_dir(), xdr_fh();


@@ -300,7 +301,7 @@ mountfs(spec, name, flags, type, options, mntopts)
                                perror("mount: vfork starting file system");
                                return (1);
                        }
                                perror("mount: vfork starting file system");
                                return (1);
                        }

-                       if (waitpid(pid, &status, 0) != -1 &&
+                       if (waitpid(pid, (int *)&status, 0) != -1 &&

                            WIFEXITED(status) &&
                            WEXITSTATUS(status) != 0)
                                return (WEXITSTATUS(status));
                            WIFEXITED(status) &&
                            WEXITSTATUS(status) != 0)
                                return (WEXITSTATUS(status));


@@ -348,7 +349,7 @@ out:
        return(0);
 }
 
        return(0);
 }
 

-static
+static void

 prmount(spec, name, flags)
        char *spec, *name;
        register short flags;
 prmount(spec, name, flags)
        char *spec, *name;
        register short flags;

diff --git a/usr/src/sbin/mountd/mountd.c b/usr/src/sbin/mountd/mountd.c
index 73e1ddb..9902731 100644 (file)
--- a/usr/src/sbin/mountd/mountd.c
+++ b/usr/src/sbin/mountd/mountd.c
@@ -15,7 +15,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)mountd.c   5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)mountd.c   5.14 (Berkeley) %G%";

 #endif not lint
 
 #include <sys/param.h>
 #endif not lint
 
 #include <sys/param.h>


@@ -67,9 +67,9 @@ struct grouplist {
 };
 
 /* Global defs */
 };
 
 /* Global defs */

-int xdr_fhs(), xdr_mlist(), xdr_dir(), xdr_explist();
-int mntsrv(), get_exportlist(), send_umntall(), umntall_each();
-void get_mountlist(), add_mlist(), del_mlist();
+int mntsrv(), umntall_each(), xdr_fhs(), xdr_mlist(), xdr_dir(), xdr_explist();
+void add_mlist(), del_mlist(), get_exportlist(), get_mountlist();
+void send_umntall();

 struct exportlist exphead;
 struct mountlist *mlhead;
 char exname[MAXPATHLEN];
 struct exportlist exphead;
 struct mountlist *mlhead;
 char exname[MAXPATHLEN];


@@ -396,6 +396,7 @@ char line[LINESIZ];
 /*
  * Get the export list
  */
 /*
  * Get the export list
  */

+void

 get_exportlist()
 {
        register struct hostent *hp, *nhp;
 get_exportlist()
 {
        register struct hostent *hp, *nhp;


@@ -773,6 +774,7 @@ void add_mlist(hostp, dirp)
  * This function is called via. SIGTERM when the system is going down.
  * It sends a broadcast RPCMNT_UMNTALL.
  */
  * This function is called via. SIGTERM when the system is going down.
  * It sends a broadcast RPCMNT_UMNTALL.
  */

+void

 send_umntall()
 {
        (void) clnt_broadcast(RPCPROG_MNT, RPCMNT_VER1, RPCMNT_UMNTALL,
 send_umntall()
 {
        (void) clnt_broadcast(RPCPROG_MNT, RPCMNT_VER1, RPCMNT_UMNTALL,

diff --git a/usr/src/sbin/newfs/mkfs.c b/usr/src/sbin/newfs/mkfs.c
index 577f5b4..5854134 100644 (file)
--- a/usr/src/sbin/newfs/mkfs.c
+++ b/usr/src/sbin/newfs/mkfs.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)mkfs.c     6.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)mkfs.c     6.16 (Berkeley) %G%";

 #endif /* not lint */
 
 #ifndef STANDALONE
 #endif /* not lint */
 
 #ifndef STANDALONE


@@ -116,7 +116,8 @@ mkfs(pp, fsys, fi, fo)
        long used, mincpgcnt, bpcg;
        long mapcramped, inodecramped;
        long postblsize, rotblsize, totalsbsize;
        long used, mincpgcnt, bpcg;
        long mapcramped, inodecramped;
        long postblsize, rotblsize, totalsbsize;

-       int ppid, status, started();
+       int ppid, status;
+       void started();

 
 #ifndef STANDALONE
        time(&utime);
 
 #ifndef STANDALONE
        time(&utime);

diff --git a/usr/src/sbin/reboot/halt.c b/usr/src/sbin/reboot/halt.c
index d8fdfe2..ead32b8 100644 (file)
--- a/usr/src/sbin/reboot/halt.c
+++ b/usr/src/sbin/reboot/halt.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)halt.c     5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)halt.c     5.9 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -114,6 +114,7 @@ main(argc, argv)
        perror("halt");
 }
 
        perror("halt");
 }
 

+void

 dingdong()
 {
        /* RRRIIINNNGGG RRRIIINNNGGG */
 dingdong()
 {
        /* RRRIIINNNGGG RRRIIINNNGGG */