VOID=>void

SCCS-vsn: sys/kern/kern_physio.c 3.4
SCCS-vsn: sys/kern/vfs_bio.c 3.4
SCCS-vsn: sys/kern/vfs_cluster.c 3.4
SCCS-vsn: sys/kern/kern_clock.c 3.5
SCCS-vsn: sys/vax/vax/flp.c 3.2
SCCS-vsn: sys/vax/mba/hp.c 3.3
SCCS-vsn: sys/vax/mba/ht.c 3.2
SCCS-vsn: sys/vax/vax/machdep.c 3.4
SCCS-vsn: sys/kern/tty_subr.c 3.2
SCCS-vsn: sys/kern/kern_synch.c 3.7
SCCS-vsn: sys/kern/kern_proc.c 3.3
SCCS-vsn: sys/vax/uba/va.c 3.2
SCCS-vsn: sys/vax/uba/vp.c 3.2
SCCS-vsn: sys/kern/init_main.c 3.4

diff --git a/usr/src/sys/kern/init_main.c b/usr/src/sys/kern/init_main.c
index 982a64d..de9e97f 100644 (file)
--- a/usr/src/sys/kern/init_main.c
+++ b/usr/src/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*     init_main.c     3.3     %H%     */
+/*     init_main.c     3.4     %H%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -105,7 +105,7 @@ main(firstaddr)
        proc[0].p_szpt = CLSIZE;
        if (newproc(0)) {
                expand(clrnd((int)btoc(szicode)), P0BR);
        proc[0].p_szpt = CLSIZE;
        if (newproc(0)) {
                expand(clrnd((int)btoc(szicode)), P0BR);

-               VOID copyout((caddr_t)icode, (caddr_t)0, (unsigned)szicode);
+               (void) copyout((caddr_t)icode, (caddr_t)0, (unsigned)szicode);

                /*
                 * Return goes to loc. 0 of user init
                 * code just copied out.
                /*
                 * Return goes to loc. 0 of user init
                 * code just copied out.

diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c
index 076ad28..e01550e 100644 (file)
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*     kern_clock.c    3.4     %H%     */
+/*     kern_clock.c    3.5     %H%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -131,7 +131,7 @@ out:
                if(++pp->p_cpu == 0)
                        pp->p_cpu--;
                if(pp->p_cpu % 16 == 0) {
                if(++pp->p_cpu == 0)
                        pp->p_cpu--;
                if(pp->p_cpu % 16 == 0) {

-                       VOID setpri(pp);
+                       (void) setpri(pp);

                        if (pp->p_pri >= PUSER)
                                pp->p_pri = pp->p_usrpri;
                }
                        if (pp->p_pri >= PUSER)
                                pp->p_pri = pp->p_usrpri;
                }


@@ -146,7 +146,7 @@ out:
                        return;
                lbolt -= HZ;
                ++time;
                        return;
                lbolt -= HZ;
                ++time;

-               VOID spl1();
+               (void) spl1();

                runrun++;
                wakeup((caddr_t)&lbolt);
                for(pp = &proc[0]; pp < &proc[NPROC]; pp++)
                runrun++;
                wakeup((caddr_t)&lbolt);
                for(pp = &proc[0]; pp < &proc[NPROC]; pp++)


@@ -176,7 +176,7 @@ out:
                        if(a > 255)
                                a = 255;
                        pp->p_cpu = a;
                        if(a > 255)
                                a = 255;
                        pp->p_cpu = a;

-                       VOID setpri(pp);
+                       (void) setpri(pp);

                        s = spl6();
                        if(pp->p_pri >= PUSER) {
                                if ((pp != u.u_procp || noproc) &&
                        s = spl6();
                        if(pp->p_pri >= PUSER) {
                                if ((pp != u.u_procp || noproc) &&


@@ -211,7 +211,7 @@ out:
                        if (pp->p_uid)
                                if (pp->p_nice == NZERO && u.u_vm.vm_utime > 600 * HZ)
                                        pp->p_nice = NZERO+4;
                        if (pp->p_uid)
                                if (pp->p_nice == NZERO && u.u_vm.vm_utime > 600 * HZ)
                                        pp->p_nice = NZERO+4;

-                       VOID setpri(pp);
+                       (void) setpri(pp);

                        pp->p_pri = pp->p_usrpri;
                }
 #endif
                        pp->p_pri = pp->p_usrpri;
                }
 #endif

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index 6b98ded..7851aa9 100644 (file)
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/*     kern_physio.c   3.3     %H%     */
+/*     kern_physio.c   3.4     %H%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -302,18 +302,18 @@ daddr_t blkno;
        register int dblkno = fsbtodb(blkno);
 
     loop:
        register int dblkno = fsbtodb(blkno);
 
     loop:

-       VOID spl0();
+       (void) spl0();

        for (bp = &buf[bufhash[BUFHASH(blkno)]]; bp != &buf[-1];
            bp = &buf[bp->b_hlink]) {
                if (bp->b_blkno != dblkno || bp->b_dev != dev)
                        continue;
        for (bp = &buf[bufhash[BUFHASH(blkno)]]; bp != &buf[-1];
            bp = &buf[bp->b_hlink]) {
                if (bp->b_blkno != dblkno || bp->b_dev != dev)
                        continue;

-               VOID spl6();
+               (void) spl6();

                if (bp->b_flags&B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        sleep((caddr_t)bp, PRIBIO+1);
                        goto loop;
                }
                if (bp->b_flags&B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        sleep((caddr_t)bp, PRIBIO+1);
                        goto loop;
                }

-               VOID spl0();
+               (void) spl0();

 #ifdef DISKMON
                i = 0;
                dp = bp->av_forw;
 #ifdef DISKMON
                i = 0;
                dp = bp->av_forw;


@@ -333,7 +333,7 @@ daddr_t blkno;
        dp = bdevsw[major(dev)].d_tab;
        if (dp == NULL)
                panic("devtab");
        dp = bdevsw[major(dev)].d_tab;
        if (dp == NULL)
                panic("devtab");

-       VOID spl6();
+       (void) spl6();

        if (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        if (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);


@@ -391,12 +391,12 @@ geteblk()
        register int i, x;
 
 loop:
        register int i, x;
 
 loop:

-       VOID spl6();
+       (void) spl6();

        while (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        }
        while (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        }

-       VOID spl0();
+       (void) spl0();

        dp = &bfreelist;
        bp = bfreelist.av_forw;
        notavail(bp);
        dp = &bfreelist;
        bp = bfreelist.av_forw;
        notavail(bp);


@@ -450,10 +450,10 @@ iowait(bp)
 register struct buf *bp;
 {
 
 register struct buf *bp;
 {
 

-       VOID spl6();
+       (void) spl6();

        while ((bp->b_flags&B_DONE)==0)
                sleep((caddr_t)bp, PRIBIO);
        while ((bp->b_flags&B_DONE)==0)
                sleep((caddr_t)bp, PRIBIO);

-       VOID spl0();
+       (void) spl0();

        geterror(bp);
 }
 
        geterror(bp);
 }
 


@@ -552,14 +552,14 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
        int p2dp;
        register struct pte *dpte, *vpte;
 
        int p2dp;
        register struct pte *dpte, *vpte;
 

-       VOID spl6();
+       (void) spl6();

        while (bswlist.av_forw == NULL) {
                bswlist.b_flags |= B_WANTED;
                sleep((caddr_t)&bswlist, PSWP+1);
        }
        bp = bswlist.av_forw;
        bswlist.av_forw = bp->av_forw;
        while (bswlist.av_forw == NULL) {
                bswlist.b_flags |= B_WANTED;
                sleep((caddr_t)&bswlist, PSWP+1);
        }
        bp = bswlist.av_forw;
        bswlist.av_forw = bp->av_forw;

-       VOID spl0();
+       (void) spl0();

 
        bp->b_flags = B_BUSY | B_PHYS | rdflg | flag;
        if ((bp->b_flags & (B_DIRTY|B_PGIN)) == 0)
 
        bp->b_flags = B_BUSY | B_PHYS | rdflg | flag;
        if ((bp->b_flags & (B_DIRTY|B_PGIN)) == 0)


@@ -595,10 +595,10 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                        swpf[bp - swbuf] = pfcent;
                        return;
                }
                        swpf[bp - swbuf] = pfcent;
                        return;
                }

-               VOID spl6();
+               (void) spl6();

                while((bp->b_flags&B_DONE)==0)
                        sleep((caddr_t)bp, PSWP);
                while((bp->b_flags&B_DONE)==0)
                        sleep((caddr_t)bp, PSWP);

-               VOID spl0();
+               (void) spl0();

                bp->b_un.b_addr += c;
                bp->b_flags &= ~B_DONE;
                if (bp->b_flags & B_ERROR) {
                bp->b_un.b_addr += c;
                bp->b_flags &= ~B_DONE;
                if (bp->b_flags & B_ERROR) {


@@ -609,7 +609,7 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                nbytes -= c;
                dblkno += btoc(c);
        }
                nbytes -= c;
                dblkno += btoc(c);
        }

-       VOID spl6();
+       (void) spl6();

        bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_PAGET|B_UAREA|B_DIRTY);
        bp->av_forw = bswlist.av_forw;
        bswlist.av_forw = bp;
        bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_PAGET|B_UAREA|B_DIRTY);
        bp->av_forw = bswlist.av_forw;
        bswlist.av_forw = bp;


@@ -618,7 +618,7 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                wakeup((caddr_t)&bswlist);
                wakeup((caddr_t)&proc[2]);
        }
                wakeup((caddr_t)&bswlist);
                wakeup((caddr_t)&proc[2]);
        }

-       VOID spl0();
+       (void) spl0();

 }
 
 /*
 }
 
 /*


@@ -658,7 +658,7 @@ dev_t dev;
        register struct buf *bp;
 
 loop:
        register struct buf *bp;
 
 loop:

-       VOID spl6();
+       (void) spl6();

        for (bp = bfreelist.av_forw; bp != &bfreelist; bp = bp->av_forw) {
                if (bp->b_flags&B_DELWRI && (dev == NODEV||dev==bp->b_dev)) {
                        bp->b_flags |= B_ASYNC;
        for (bp = bfreelist.av_forw; bp != &bfreelist; bp = bp->av_forw) {
                if (bp->b_flags&B_DELWRI && (dev == NODEV||dev==bp->b_dev)) {
                        bp->b_flags |= B_ASYNC;


@@ -667,7 +667,7 @@ loop:
                        goto loop;
                }
        }
                        goto loop;
                }
        }

-       VOID spl0();
+       (void) spl0();

 }
 
 /*
 }
 
 /*


@@ -696,7 +696,7 @@ unsigned (*mincnt)();
                u.u_error = EFAULT;
                return;
        }
                u.u_error = EFAULT;
                return;
        }

-       VOID spl6();
+       (void) spl6();

        while (bp->b_flags&B_BUSY) {
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO+1);
        while (bp->b_flags&B_BUSY) {
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO+1);


@@ -714,14 +714,14 @@ unsigned (*mincnt)();
                u.u_procp->p_flag |= SPHYSIO;
                vslock(a = bp->b_un.b_addr, c);
                (*strat)(bp);
                u.u_procp->p_flag |= SPHYSIO;
                vslock(a = bp->b_un.b_addr, c);
                (*strat)(bp);

-               VOID spl6();
+               (void) spl6();

                while ((bp->b_flags&B_DONE) == 0)
                        sleep((caddr_t)bp, PRIBIO);
                vsunlock(a, c, rw);
                u.u_procp->p_flag &= ~SPHYSIO;
                if (bp->b_flags&B_WANTED)
                        wakeup((caddr_t)bp);
                while ((bp->b_flags&B_DONE) == 0)
                        sleep((caddr_t)bp, PRIBIO);
                vsunlock(a, c, rw);
                u.u_procp->p_flag &= ~SPHYSIO;
                if (bp->b_flags&B_WANTED)
                        wakeup((caddr_t)bp);

-               VOID spl0();
+               (void) spl0();

                bp->b_un.b_addr += c;
                u.u_count -= c;
                u.u_offset += c;
                bp->b_un.b_addr += c;
                u.u_count -= c;
                u.u_offset += c;

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index 04d1a52..eb160d6 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*     kern_proc.c     3.2     %H%     */
+/*     kern_proc.c     3.3     %H%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -127,17 +127,17 @@ badarg:
        ucp = USRSTACK - nc - NBPW;
        ap = ucp - na*NBPW - 3*NBPW;
        u.u_ar0[SP] = ap;
        ucp = USRSTACK - nc - NBPW;
        ap = ucp - na*NBPW - 3*NBPW;
        u.u_ar0[SP] = ap;

-       VOID suword((caddr_t)ap, na-ne);
+       (void) suword((caddr_t)ap, na-ne);

        nc = 0;
        for (;;) {
                ap += NBPW;
                if (na==ne) {
        nc = 0;
        for (;;) {
                ap += NBPW;
                if (na==ne) {

-                       VOID suword((caddr_t)ap, 0);
+                       (void) suword((caddr_t)ap, 0);

                        ap += NBPW;
                }
                if (--na < 0)
                        break;
                        ap += NBPW;
                }
                if (--na < 0)
                        break;

-               VOID suword((caddr_t)ap, ucp);
+               (void) suword((caddr_t)ap, ucp);

                do {
                        if ((nc&BMASK) == 0) {
                                if (bp)
                do {
                        if ((nc&BMASK) == 0) {
                                if (bp)


@@ -147,12 +147,12 @@ badarg:
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                cp = bp->b_un.b_addr;
                        }
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                cp = bp->b_un.b_addr;
                        }

-                       VOID subyte((caddr_t)ucp++, (c = *cp++));
+                       (void) subyte((caddr_t)ucp++, (c = *cp++));

                        nc++;
                } while(c&0377);
        }
                        nc++;
                } while(c&0377);
        }

-       VOID suword((caddr_t)ap, 0);
-       VOID suword((caddr_t)ucp, 0);
+       (void) suword((caddr_t)ap, 0);
+       (void) suword((caddr_t)ucp, 0);

        setregs();
 bad:
        if (bp)
        setregs();
 bad:
        if (bp)


@@ -561,8 +561,8 @@ fork1(isvfork)
        if (p2==NULL || (u.u_uid!=0 && (p2==&proc[NPROC-1] || a>MAXUPRC))) {
                u.u_error = EAGAIN;
                if (!isvfork) {
        if (p2==NULL || (u.u_uid!=0 && (p2==&proc[NPROC-1] || a>MAXUPRC))) {
                u.u_error = EAGAIN;
                if (!isvfork) {

-                       VOID vsexpand(0, &u.u_cdmap, 1);
-                       VOID vsexpand(0, &u.u_csmap, 1);
+                       (void) vsexpand(0, &u.u_cdmap, 1);
+                       (void) vsexpand(0, &u.u_csmap, 1);

                }
                goto out;
        }
                }
                goto out;
        }

diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c
index 64cfef1..973121a 100644 (file)
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*     kern_synch.c    3.6     %H%     */
+/*     kern_synch.c    3.7     %H%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -48,10 +48,10 @@ caddr_t chan;
                        rp->p_wchan = 0;
                        rp->p_stat = SRUN;
                        slpque[h] = rp->p_link;
                        rp->p_wchan = 0;
                        rp->p_stat = SRUN;
                        slpque[h] = rp->p_link;

-                       VOID spl0();
+                       (void) spl0();

                        goto psig;
                }
                        goto psig;
                }

-               VOID spl0();
+               (void) spl0();

                if(runin != 0) {
                        runin = 0;
                        wakeup((caddr_t)&runin);
                if(runin != 0) {
                        runin = 0;
                        wakeup((caddr_t)&runin);


@@ -60,7 +60,7 @@ caddr_t chan;
                if(rp->p_sig && issig())
                        goto psig;
        } else {
                if(rp->p_sig && issig())
                        goto psig;
        } else {

-               VOID spl0();
+               (void) spl0();

                swtch();
        }
        splx(s);
                swtch();
        }
        splx(s);

diff --git a/usr/src/sys/kern/tty_subr.c b/usr/src/sys/kern/tty_subr.c
index f193895..30a6a7d 100644 (file)
--- a/usr/src/sys/kern/tty_subr.c
+++ b/usr/src/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/*     tty_subr.c      3.1     %H%     */
+/*     tty_subr.c      3.2     %H%     */

 
 #include "../h/param.h"
 #include "../h/tty.h"
 
 #include "../h/param.h"
 #include "../h/tty.h"


@@ -316,8 +316,8 @@ register struct clist *p;
                splx(s);
                return(-1);
        }
                splx(s);
                return(-1);
        }

-       VOID putc(c, p);
-       VOID putc(c>>8, p);
+       (void) putc(c, p);
+       (void) putc(c>>8, p);

        splx(s);
        return(0);
 }
        splx(s);
        return(0);
 }

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 1eacfed..deacb3d 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*     vfs_bio.c       3.3     %H%     */
+/*     vfs_bio.c       3.4     %H%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -302,18 +302,18 @@ daddr_t blkno;
        register int dblkno = fsbtodb(blkno);
 
     loop:
        register int dblkno = fsbtodb(blkno);
 
     loop:

-       VOID spl0();
+       (void) spl0();

        for (bp = &buf[bufhash[BUFHASH(blkno)]]; bp != &buf[-1];
            bp = &buf[bp->b_hlink]) {
                if (bp->b_blkno != dblkno || bp->b_dev != dev)
                        continue;
        for (bp = &buf[bufhash[BUFHASH(blkno)]]; bp != &buf[-1];
            bp = &buf[bp->b_hlink]) {
                if (bp->b_blkno != dblkno || bp->b_dev != dev)
                        continue;

-               VOID spl6();
+               (void) spl6();

                if (bp->b_flags&B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        sleep((caddr_t)bp, PRIBIO+1);
                        goto loop;
                }
                if (bp->b_flags&B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        sleep((caddr_t)bp, PRIBIO+1);
                        goto loop;
                }

-               VOID spl0();
+               (void) spl0();

 #ifdef DISKMON
                i = 0;
                dp = bp->av_forw;
 #ifdef DISKMON
                i = 0;
                dp = bp->av_forw;


@@ -333,7 +333,7 @@ daddr_t blkno;
        dp = bdevsw[major(dev)].d_tab;
        if (dp == NULL)
                panic("devtab");
        dp = bdevsw[major(dev)].d_tab;
        if (dp == NULL)
                panic("devtab");

-       VOID spl6();
+       (void) spl6();

        if (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        if (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);


@@ -391,12 +391,12 @@ geteblk()
        register int i, x;
 
 loop:
        register int i, x;
 
 loop:

-       VOID spl6();
+       (void) spl6();

        while (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        }
        while (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        }

-       VOID spl0();
+       (void) spl0();

        dp = &bfreelist;
        bp = bfreelist.av_forw;
        notavail(bp);
        dp = &bfreelist;
        bp = bfreelist.av_forw;
        notavail(bp);


@@ -450,10 +450,10 @@ iowait(bp)
 register struct buf *bp;
 {
 
 register struct buf *bp;
 {
 

-       VOID spl6();
+       (void) spl6();

        while ((bp->b_flags&B_DONE)==0)
                sleep((caddr_t)bp, PRIBIO);
        while ((bp->b_flags&B_DONE)==0)
                sleep((caddr_t)bp, PRIBIO);

-       VOID spl0();
+       (void) spl0();

        geterror(bp);
 }
 
        geterror(bp);
 }
 


@@ -552,14 +552,14 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
        int p2dp;
        register struct pte *dpte, *vpte;
 
        int p2dp;
        register struct pte *dpte, *vpte;
 

-       VOID spl6();
+       (void) spl6();

        while (bswlist.av_forw == NULL) {
                bswlist.b_flags |= B_WANTED;
                sleep((caddr_t)&bswlist, PSWP+1);
        }
        bp = bswlist.av_forw;
        bswlist.av_forw = bp->av_forw;
        while (bswlist.av_forw == NULL) {
                bswlist.b_flags |= B_WANTED;
                sleep((caddr_t)&bswlist, PSWP+1);
        }
        bp = bswlist.av_forw;
        bswlist.av_forw = bp->av_forw;

-       VOID spl0();
+       (void) spl0();

 
        bp->b_flags = B_BUSY | B_PHYS | rdflg | flag;
        if ((bp->b_flags & (B_DIRTY|B_PGIN)) == 0)
 
        bp->b_flags = B_BUSY | B_PHYS | rdflg | flag;
        if ((bp->b_flags & (B_DIRTY|B_PGIN)) == 0)


@@ -595,10 +595,10 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                        swpf[bp - swbuf] = pfcent;
                        return;
                }
                        swpf[bp - swbuf] = pfcent;
                        return;
                }

-               VOID spl6();
+               (void) spl6();

                while((bp->b_flags&B_DONE)==0)
                        sleep((caddr_t)bp, PSWP);
                while((bp->b_flags&B_DONE)==0)
                        sleep((caddr_t)bp, PSWP);

-               VOID spl0();
+               (void) spl0();

                bp->b_un.b_addr += c;
                bp->b_flags &= ~B_DONE;
                if (bp->b_flags & B_ERROR) {
                bp->b_un.b_addr += c;
                bp->b_flags &= ~B_DONE;
                if (bp->b_flags & B_ERROR) {


@@ -609,7 +609,7 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                nbytes -= c;
                dblkno += btoc(c);
        }
                nbytes -= c;
                dblkno += btoc(c);
        }

-       VOID spl6();
+       (void) spl6();

        bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_PAGET|B_UAREA|B_DIRTY);
        bp->av_forw = bswlist.av_forw;
        bswlist.av_forw = bp;
        bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_PAGET|B_UAREA|B_DIRTY);
        bp->av_forw = bswlist.av_forw;
        bswlist.av_forw = bp;


@@ -618,7 +618,7 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                wakeup((caddr_t)&bswlist);
                wakeup((caddr_t)&proc[2]);
        }
                wakeup((caddr_t)&bswlist);
                wakeup((caddr_t)&proc[2]);
        }

-       VOID spl0();
+       (void) spl0();

 }
 
 /*
 }
 
 /*


@@ -658,7 +658,7 @@ dev_t dev;
        register struct buf *bp;
 
 loop:
        register struct buf *bp;
 
 loop:

-       VOID spl6();
+       (void) spl6();

        for (bp = bfreelist.av_forw; bp != &bfreelist; bp = bp->av_forw) {
                if (bp->b_flags&B_DELWRI && (dev == NODEV||dev==bp->b_dev)) {
                        bp->b_flags |= B_ASYNC;
        for (bp = bfreelist.av_forw; bp != &bfreelist; bp = bp->av_forw) {
                if (bp->b_flags&B_DELWRI && (dev == NODEV||dev==bp->b_dev)) {
                        bp->b_flags |= B_ASYNC;


@@ -667,7 +667,7 @@ loop:
                        goto loop;
                }
        }
                        goto loop;
                }
        }

-       VOID spl0();
+       (void) spl0();

 }
 
 /*
 }
 
 /*


@@ -696,7 +696,7 @@ unsigned (*mincnt)();
                u.u_error = EFAULT;
                return;
        }
                u.u_error = EFAULT;
                return;
        }

-       VOID spl6();
+       (void) spl6();

        while (bp->b_flags&B_BUSY) {
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO+1);
        while (bp->b_flags&B_BUSY) {
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO+1);


@@ -714,14 +714,14 @@ unsigned (*mincnt)();
                u.u_procp->p_flag |= SPHYSIO;
                vslock(a = bp->b_un.b_addr, c);
                (*strat)(bp);
                u.u_procp->p_flag |= SPHYSIO;
                vslock(a = bp->b_un.b_addr, c);
                (*strat)(bp);

-               VOID spl6();
+               (void) spl6();

                while ((bp->b_flags&B_DONE) == 0)
                        sleep((caddr_t)bp, PRIBIO);
                vsunlock(a, c, rw);
                u.u_procp->p_flag &= ~SPHYSIO;
                if (bp->b_flags&B_WANTED)
                        wakeup((caddr_t)bp);
                while ((bp->b_flags&B_DONE) == 0)
                        sleep((caddr_t)bp, PRIBIO);
                vsunlock(a, c, rw);
                u.u_procp->p_flag &= ~SPHYSIO;
                if (bp->b_flags&B_WANTED)
                        wakeup((caddr_t)bp);

-               VOID spl0();
+               (void) spl0();

                bp->b_un.b_addr += c;
                u.u_count -= c;
                u.u_offset += c;
                bp->b_un.b_addr += c;
                u.u_count -= c;
                u.u_offset += c;

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index 1a3d565..7151cb2 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*     vfs_cluster.c   3.3     %H%     */
+/*     vfs_cluster.c   3.4     %H%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -302,18 +302,18 @@ daddr_t blkno;
        register int dblkno = fsbtodb(blkno);
 
     loop:
        register int dblkno = fsbtodb(blkno);
 
     loop:

-       VOID spl0();
+       (void) spl0();

        for (bp = &buf[bufhash[BUFHASH(blkno)]]; bp != &buf[-1];
            bp = &buf[bp->b_hlink]) {
                if (bp->b_blkno != dblkno || bp->b_dev != dev)
                        continue;
        for (bp = &buf[bufhash[BUFHASH(blkno)]]; bp != &buf[-1];
            bp = &buf[bp->b_hlink]) {
                if (bp->b_blkno != dblkno || bp->b_dev != dev)
                        continue;

-               VOID spl6();
+               (void) spl6();

                if (bp->b_flags&B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        sleep((caddr_t)bp, PRIBIO+1);
                        goto loop;
                }
                if (bp->b_flags&B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        sleep((caddr_t)bp, PRIBIO+1);
                        goto loop;
                }

-               VOID spl0();
+               (void) spl0();

 #ifdef DISKMON
                i = 0;
                dp = bp->av_forw;
 #ifdef DISKMON
                i = 0;
                dp = bp->av_forw;


@@ -333,7 +333,7 @@ daddr_t blkno;
        dp = bdevsw[major(dev)].d_tab;
        if (dp == NULL)
                panic("devtab");
        dp = bdevsw[major(dev)].d_tab;
        if (dp == NULL)
                panic("devtab");

-       VOID spl6();
+       (void) spl6();

        if (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        if (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);


@@ -391,12 +391,12 @@ geteblk()
        register int i, x;
 
 loop:
        register int i, x;
 
 loop:

-       VOID spl6();
+       (void) spl6();

        while (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        }
        while (bfreelist.av_forw == &bfreelist) {
                bfreelist.b_flags |= B_WANTED;
                sleep((caddr_t)&bfreelist, PRIBIO+1);
        }

-       VOID spl0();
+       (void) spl0();

        dp = &bfreelist;
        bp = bfreelist.av_forw;
        notavail(bp);
        dp = &bfreelist;
        bp = bfreelist.av_forw;
        notavail(bp);


@@ -450,10 +450,10 @@ iowait(bp)
 register struct buf *bp;
 {
 
 register struct buf *bp;
 {
 

-       VOID spl6();
+       (void) spl6();

        while ((bp->b_flags&B_DONE)==0)
                sleep((caddr_t)bp, PRIBIO);
        while ((bp->b_flags&B_DONE)==0)
                sleep((caddr_t)bp, PRIBIO);

-       VOID spl0();
+       (void) spl0();

        geterror(bp);
 }
 
        geterror(bp);
 }
 


@@ -552,14 +552,14 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
        int p2dp;
        register struct pte *dpte, *vpte;
 
        int p2dp;
        register struct pte *dpte, *vpte;
 

-       VOID spl6();
+       (void) spl6();

        while (bswlist.av_forw == NULL) {
                bswlist.b_flags |= B_WANTED;
                sleep((caddr_t)&bswlist, PSWP+1);
        }
        bp = bswlist.av_forw;
        bswlist.av_forw = bp->av_forw;
        while (bswlist.av_forw == NULL) {
                bswlist.b_flags |= B_WANTED;
                sleep((caddr_t)&bswlist, PSWP+1);
        }
        bp = bswlist.av_forw;
        bswlist.av_forw = bp->av_forw;

-       VOID spl0();
+       (void) spl0();

 
        bp->b_flags = B_BUSY | B_PHYS | rdflg | flag;
        if ((bp->b_flags & (B_DIRTY|B_PGIN)) == 0)
 
        bp->b_flags = B_BUSY | B_PHYS | rdflg | flag;
        if ((bp->b_flags & (B_DIRTY|B_PGIN)) == 0)


@@ -595,10 +595,10 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                        swpf[bp - swbuf] = pfcent;
                        return;
                }
                        swpf[bp - swbuf] = pfcent;
                        return;
                }

-               VOID spl6();
+               (void) spl6();

                while((bp->b_flags&B_DONE)==0)
                        sleep((caddr_t)bp, PSWP);
                while((bp->b_flags&B_DONE)==0)
                        sleep((caddr_t)bp, PSWP);

-               VOID spl0();
+               (void) spl0();

                bp->b_un.b_addr += c;
                bp->b_flags &= ~B_DONE;
                if (bp->b_flags & B_ERROR) {
                bp->b_un.b_addr += c;
                bp->b_flags &= ~B_DONE;
                if (bp->b_flags & B_ERROR) {


@@ -609,7 +609,7 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                nbytes -= c;
                dblkno += btoc(c);
        }
                nbytes -= c;
                dblkno += btoc(c);
        }

-       VOID spl6();
+       (void) spl6();

        bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_PAGET|B_UAREA|B_DIRTY);
        bp->av_forw = bswlist.av_forw;
        bswlist.av_forw = bp;
        bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_PAGET|B_UAREA|B_DIRTY);
        bp->av_forw = bswlist.av_forw;
        bswlist.av_forw = bp;


@@ -618,7 +618,7 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                wakeup((caddr_t)&bswlist);
                wakeup((caddr_t)&proc[2]);
        }
                wakeup((caddr_t)&bswlist);
                wakeup((caddr_t)&proc[2]);
        }

-       VOID spl0();
+       (void) spl0();

 }
 
 /*
 }
 
 /*


@@ -658,7 +658,7 @@ dev_t dev;
        register struct buf *bp;
 
 loop:
        register struct buf *bp;
 
 loop:

-       VOID spl6();
+       (void) spl6();

        for (bp = bfreelist.av_forw; bp != &bfreelist; bp = bp->av_forw) {
                if (bp->b_flags&B_DELWRI && (dev == NODEV||dev==bp->b_dev)) {
                        bp->b_flags |= B_ASYNC;
        for (bp = bfreelist.av_forw; bp != &bfreelist; bp = bp->av_forw) {
                if (bp->b_flags&B_DELWRI && (dev == NODEV||dev==bp->b_dev)) {
                        bp->b_flags |= B_ASYNC;


@@ -667,7 +667,7 @@ loop:
                        goto loop;
                }
        }
                        goto loop;
                }
        }

-       VOID spl0();
+       (void) spl0();

 }
 
 /*
 }
 
 /*


@@ -696,7 +696,7 @@ unsigned (*mincnt)();
                u.u_error = EFAULT;
                return;
        }
                u.u_error = EFAULT;
                return;
        }

-       VOID spl6();
+       (void) spl6();

        while (bp->b_flags&B_BUSY) {
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO+1);
        while (bp->b_flags&B_BUSY) {
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO+1);


@@ -714,14 +714,14 @@ unsigned (*mincnt)();
                u.u_procp->p_flag |= SPHYSIO;
                vslock(a = bp->b_un.b_addr, c);
                (*strat)(bp);
                u.u_procp->p_flag |= SPHYSIO;
                vslock(a = bp->b_un.b_addr, c);
                (*strat)(bp);

-               VOID spl6();
+               (void) spl6();

                while ((bp->b_flags&B_DONE) == 0)
                        sleep((caddr_t)bp, PRIBIO);
                vsunlock(a, c, rw);
                u.u_procp->p_flag &= ~SPHYSIO;
                if (bp->b_flags&B_WANTED)
                        wakeup((caddr_t)bp);
                while ((bp->b_flags&B_DONE) == 0)
                        sleep((caddr_t)bp, PRIBIO);
                vsunlock(a, c, rw);
                u.u_procp->p_flag &= ~SPHYSIO;
                if (bp->b_flags&B_WANTED)
                        wakeup((caddr_t)bp);

-               VOID spl0();
+               (void) spl0();

                bp->b_un.b_addr += c;
                u.u_count -= c;
                u.u_offset += c;
                bp->b_un.b_addr += c;
                u.u_count -= c;
                u.u_offset += c;

diff --git a/usr/src/sys/vax/mba/hp.c b/usr/src/sys/vax/mba/hp.c
index 4e56a52..a7f438c 100644 (file)
--- a/usr/src/sys/vax/mba/hp.c
+++ b/usr/src/sys/vax/mba/hp.c
@@ -1,4 +1,4 @@
-/*     hp.c    3.2     %H%     */
+/*     hp.c    3.3     %H%     */

 
 /*
  * RP04/RP06/RM03 disk driver
 
 /*
  * RP04/RP06/RM03 disk driver


@@ -164,14 +164,14 @@ register struct buf *bp;
        }
        bp->b_cylin = bn/nspc + sizes[xunit&07].cyloff;
        dp = &hputab[unit];
        }
        bp->b_cylin = bn/nspc + sizes[xunit&07].cyloff;
        dp = &hputab[unit];

-       VOID spl5();
+       (void) spl5();

        disksort(dp, bp);
        if (dp->b_active == 0) {
                hpustart(unit);
                if(hptab.b_active == 0)
                        hpstart();
        }
        disksort(dp, bp);
        if (dp->b_active == 0) {
                hpustart(unit);
                if(hptab.b_active == 0)
                        hpstart();
        }

-       VOID spl0();
+       (void) spl0();

 }
 
 hpustart(unit)
 }
 
 hpustart(unit)

diff --git a/usr/src/sys/vax/mba/ht.c b/usr/src/sys/vax/mba/ht.c
index b3b2386..a473613 100644 (file)
--- a/usr/src/sys/vax/mba/ht.c
+++ b/usr/src/sys/vax/mba/ht.c
@@ -1,4 +1,4 @@
-/*     ht.c    3.1     %H%     */
+/*     ht.c    3.2     %H%     */

 
 /*
  * TJU16 tape driver
 
 /*
  * TJU16 tape driver


@@ -105,14 +105,14 @@ htclose(dev, flag)
 
        unit = minor(dev) & 03;
        if (flag == FWRITE || ((flag&FWRITE) && (h_flags[unit]&H_WRITTEN))) {
 
        unit = minor(dev) & 03;
        if (flag == FWRITE || ((flag&FWRITE) && (h_flags[unit]&H_WRITTEN))) {

-               VOID hcommand(dev, WEOF);
-               VOID hcommand(dev, WEOF);
-               VOID hcommand(dev, SREV);
+               (void) hcommand(dev, WEOF);
+               (void) hcommand(dev, WEOF);
+               (void) hcommand(dev, SREV);

        }
        }

-/*     VOID hcommand(dev, REW);        */
+/*     (void) hcommand(dev, REW);      */

 /* for 'mtm' file positioning */
        if((minor(dev)&4) == 0) /* no 4 -> rewind */
 /* for 'mtm' file positioning */
        if((minor(dev)&4) == 0) /* no 4 -> rewind */

-               VOID hcommand(dev, REW);
+               (void) hcommand(dev, REW);

        h_openf[unit] = 0;
 }
 
        h_openf[unit] = 0;
 }
 


@@ -121,12 +121,12 @@ hcommand(dev, com)
        register struct buf *bp;
 
        bp = &chtbuf;
        register struct buf *bp;
 
        bp = &chtbuf;

-       VOID spl5();
+       (void) spl5();

        while(bp->b_flags&B_BUSY) {
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO);
        }
        while(bp->b_flags&B_BUSY) {
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO);
        }

-       VOID spl0();
+       (void) spl0();

        bp->b_dev = dev;
        bp->b_resid = com;
        bp->b_blkno = 0;
        bp->b_dev = dev;
        bp->b_resid = com;
        bp->b_blkno = 0;


@@ -164,7 +164,7 @@ register struct buf *bp;
                }
        }
        bp->av_forw = NULL;
                }
        }
        bp->av_forw = NULL;

-       VOID spl5();
+       (void) spl5();

        if (httab.b_actf == NULL)
                httab.b_actf = bp;
        else
        if (httab.b_actf == NULL)
                httab.b_actf = bp;
        else


@@ -172,7 +172,7 @@ register struct buf *bp;
        httab.b_actl = bp;
        if (httab.b_active==0)
                htstart();
        httab.b_actl = bp;
        if (httab.b_active==0)
                htstart();

-       VOID spl0();
+       (void) spl0();

 }
 
 htstart()
 }
 
 htstart()

diff --git a/usr/src/sys/vax/uba/va.c b/usr/src/sys/vax/uba/va.c
index 6b501a8..b832d8a 100644 (file)
--- a/usr/src/sys/vax/uba/va.c
+++ b/usr/src/sys/vax/uba/va.c
@@ -1,4 +1,4 @@
-/*     va.c    3.1     %H%     */
+/*     va.c    3.2     %H%     */

 
 #ifdef ERNIE
 #include "../h/param.h"
 
 #ifdef ERNIE
 #include "../h/param.h"


@@ -96,16 +96,16 @@ vastrategy(bp)
 {
        register int e;
 
 {
        register int e;
 

-       VOID spl4();
+       (void) spl4();

        while (vainfo.va_busy)          /* Wait till not busy. */
                sleep((caddr_t)&vainfo, VAPRI);
        vainfo.va_busy = 1;             /* Grab it. */
        while (vainfo.va_busy)          /* Wait till not busy. */
                sleep((caddr_t)&vainfo, VAPRI);
        vainfo.va_busy = 1;             /* Grab it. */

-       VOID spl0();
+       (void) spl0();

 
        va_ubinfo = ubasetup(bp, vabdp);        /* Set up uba mapper. */
        vainfo.va_bufp = va_ubinfo & 0x3ffff;
 
 
        va_ubinfo = ubasetup(bp, vabdp);        /* Set up uba mapper. */
        vainfo.va_bufp = va_ubinfo & 0x3ffff;
 

-       VOID spl4();
+       (void) spl4();

        if (e = vaerror(DONE))
                goto brkout;
        vainfo.va_wcount = -(bp->b_bcount/2);
        if (e = vaerror(DONE))
                goto brkout;
        vainfo.va_wcount = -(bp->b_bcount/2);


@@ -127,7 +127,7 @@ vastrategy(bp)
                VAADDR->vacsrhi = VAAUTOSTEP;
                e |= vaerror(DONE);
        }
                VAADDR->vacsrhi = VAAUTOSTEP;
                e |= vaerror(DONE);
        }

-       VOID spl0();
+       (void) spl0();

 brkout:
        ubafree(va_ubinfo), va_ubinfo = 0;
        vainfo.va_busy = 0;
 brkout:
        ubafree(va_ubinfo), va_ubinfo = 0;
        vainfo.va_busy = 0;


@@ -185,7 +185,7 @@ vaioctl(dev, cmd, addr, flag)
        switch (cmd) {
 
        case VGETSTATE:
        switch (cmd) {
 
        case VGETSTATE:

-               VOID suword(addr, vainfo.va_state);
+               (void) suword(addr, vainfo.va_state);

                return;
 
        case VSETSTATE:
                return;
 
        case VSETSTATE:


@@ -210,8 +210,8 @@ vaioctl(dev, cmd, addr, flag)
 
 vacmd(vcmd)
 {
 
 vacmd(vcmd)
 {

-       VOID spl4();
-       VOID vaerror(DONE);     /* Wait for va to be ready. */
+       (void) spl4();
+       (void) vaerror(DONE);   /* Wait for va to be ready. */

        switch (vcmd) {
 
        case VPLOT:
        switch (vcmd) {
 
        case VPLOT:


@@ -235,7 +235,7 @@ vacmd(vcmd)
 
        if (vaerror(DONE))      /* Wait for command to complete. */
                u.u_error = EIO;
 
        if (vaerror(DONE))      /* Wait for command to complete. */
                u.u_error = EIO;

-       VOID spl0();
+       (void) spl0();

 }
 
 vatimo()
 }
 
 vatimo()

diff --git a/usr/src/sys/vax/uba/vp.c b/usr/src/sys/vax/uba/vp.c
index 53aedc2..66be86b 100644 (file)
--- a/usr/src/sys/vax/uba/vp.c
+++ b/usr/src/sys/vax/uba/vp.c
@@ -1,4 +1,4 @@
-/*     vp.c    3.1     %H%     */
+/*     vp.c    3.2     %H%     */

 
 #ifdef ERNIE
 #include "../h/param.h"
 
 #ifdef ERNIE
 #include "../h/param.h"


@@ -74,14 +74,14 @@ vpopen()
        VPADDR->prcsr = IENABLE | DTCINTR;
        vptimo();
        while (vp11.vp_state & CMNDS) {
        VPADDR->prcsr = IENABLE | DTCINTR;
        vptimo();
        while (vp11.vp_state & CMNDS) {

-               VOID spl4();
+               (void) spl4();

                if (vperror(READY)) {
                        vpclose();
                        u.u_error = EIO;
                        return;
                }
                vpstart();
                if (vperror(READY)) {
                        vpclose();
                        u.u_error = EIO;
                        return;
                }
                vpstart();

-               VOID spl0();
+               (void) spl0();

        }
 }
 
        }
 }
 


@@ -90,14 +90,14 @@ vpstrategy(bp)
 {
        register int e;
 
 {
        register int e;
 

-       VOID spl4();
+       (void) spl4();

        while (vp11.vp_state & VBUSY)
                sleep((caddr_t)&vp11, VPPRI);
        vp11.vp_state |= VBUSY;
        while (vp11.vp_state & VBUSY)
                sleep((caddr_t)&vp11, VPPRI);
        vp11.vp_state |= VBUSY;

-       VOID spl0();
+       (void) spl0();

        vp_ubinfo = ubasetup(bp, vpbdp);
        vp11.vp_bufp = vp_ubinfo & 0x3ffff;
        vp_ubinfo = ubasetup(bp, vpbdp);
        vp11.vp_bufp = vp_ubinfo & 0x3ffff;

-       VOID spl4();
+       (void) spl4();

        if (e = vperror(READY))
                goto brkout;
        vp11.vp_count = bp->b_bcount;
        if (e = vperror(READY))
                goto brkout;
        vp11.vp_count = bp->b_bcount;


@@ -108,7 +108,7 @@ vpstrategy(bp)
        vp11.vp_bufp = 0;
        if ((vp11.vp_state&MODE) == PPLOT)
                vp11.vp_state = (vp11.vp_state &~ MODE) | PLOT;
        vp11.vp_bufp = 0;
        if ((vp11.vp_state&MODE) == PPLOT)
                vp11.vp_state = (vp11.vp_state &~ MODE) | PLOT;

-       VOID spl0();
+       (void) spl0();

 brkout:
        ubafree(vp_ubinfo), vp_ubinfo = 0;
        vp11.vp_state &= ~VBUSY;
 brkout:
        ubafree(vp_ubinfo), vp_ubinfo = 0;
        vp11.vp_state &= ~VBUSY;


@@ -175,7 +175,7 @@ vpioctl(dev, cmd, addr, flag)
        switch (cmd) {
 
        case ('v'<<8)+0:
        switch (cmd) {
 
        case ('v'<<8)+0:

-               VOID suword(addr, vp11.vp_state);
+               (void) suword(addr, vp11.vp_state);

                return;
 
        case ('v'<<8)+1:
                return;
 
        case ('v'<<8)+1:


@@ -191,18 +191,18 @@ vpioctl(dev, cmd, addr, flag)
                u.u_error = ENOTTY;
                return;
        }
                u.u_error = ENOTTY;
                return;
        }

-       VOID spl4();
-       VOID vperror(READY);
+       (void) spl4();
+       (void) vperror(READY);

        if (vp11.vp_state&PPLOT)
                VPADDR->plcsr |= SPP;
        else
                VPADDR->plcsr &= ~SPP;
        vp11.vp_count = 0;
        while (CMNDS & vp11.vp_state) {
        if (vp11.vp_state&PPLOT)
                VPADDR->plcsr |= SPP;
        else
                VPADDR->plcsr &= ~SPP;
        vp11.vp_count = 0;
        while (CMNDS & vp11.vp_state) {

-               VOID vperror(READY);
+               (void) vperror(READY);

                vpstart();
        }
                vpstart();
        }

-       VOID spl0();
+       (void) spl0();

 }
 
 vptimo()
 }
 
 vptimo()

diff --git a/usr/src/sys/vax/vax/flp.c b/usr/src/sys/vax/vax/flp.c
index 4b43a16..d50fede 100644 (file)
--- a/usr/src/sys/vax/vax/flp.c
+++ b/usr/src/sys/vax/vax/flp.c
@@ -1,4 +1,4 @@
-/*     flp.c   3.1     %H%     */
+/*     flp.c   3.2     %H%     */

 
 #include "../h/flp.h"
 #include "../h/param.h"
 
 #include "../h/flp.h"
 #include "../h/param.h"


@@ -61,11 +61,11 @@ flstrategy(rw)
         */
        if (u.u_count == 0) 
                return;
         */
        if (u.u_count == 0) 
                return;

-       VOID spl4();
+       (void) spl4();

        while (fltab.fl_state & FL_BUSY)
                sleep((caddr_t)&fltab, PRIBIO);
        fltab.fl_state |= FL_BUSY;
        while (fltab.fl_state & FL_BUSY)
                sleep((caddr_t)&fltab, PRIBIO);
        fltab.fl_state |= FL_BUSY;

-       VOID spl0();
+       (void) spl0();

 
        bp = fltab.fl_buf;
        while ((i = min(RXBYSEC, u.u_count)) != 0) {
 
        bp = fltab.fl_buf;
        while ((i = min(RXBYSEC, u.u_count)) != 0) {


@@ -82,11 +82,11 @@ flstrategy(rw)
                                break;
                }
                bp->b_flags = rw;
                                break;
                }
                bp->b_flags = rw;

-               VOID spl4(); 
+               (void) spl4(); 

                flstart();
                while ((bp->b_flags & B_DONE) == 0)
                        sleep((caddr_t)bp, PRIBIO);     
                flstart();
                while ((bp->b_flags & B_DONE) == 0)
                        sleep((caddr_t)bp, PRIBIO);     

-               VOID spl0();
+               (void) spl0();

                if (bp->b_flags & B_ERROR) {
                        u.u_error = EIO;
                        break;
                if (bp->b_flags & B_ERROR) {
                        u.u_error = EIO;
                        break;

diff --git a/usr/src/sys/vax/vax/machdep.c b/usr/src/sys/vax/vax/machdep.c
index 923b481..81cb197 100644 (file)
--- a/usr/src/sys/vax/vax/machdep.c
+++ b/usr/src/sys/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/*     machdep.c       3.3     %H%     */
+/*     machdep.c       3.4     %H%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -124,7 +124,7 @@ sendsig(p, n)
 #ifdef FASTVAX
        usp -= 5;
        if ((int)usp <= USRSTACK - ctob(u.u_ssize))
 #ifdef FASTVAX
        usp -= 5;
        if ((int)usp <= USRSTACK - ctob(u.u_ssize))

-               VOID grow((unsigned)usp);
+               (void) grow((unsigned)usp);

        ;                       /* Avoid asm() label botch */
        asm("probew $3,$20,(r11)");
        asm("beql bad");
        ;                       /* Avoid asm() label botch */
        asm("probew $3,$20,(r11)");
        asm("beql bad");


@@ -135,7 +135,7 @@ sendsig(p, n)
        *usp++ = regs[PS];
        regs[SP] = (int)(usp - 5);
 #else
        *usp++ = regs[PS];
        regs[SP] = (int)(usp - 5);
 #else

-       VOID grow((unsigned)(usp-5));
+       (void) grow((unsigned)(usp-5));

        if (suword((caddr_t)--usp, regs[PS]))
                goto bad;
        if (suword((caddr_t)--usp, regs[PC]))
        if (suword((caddr_t)--usp, regs[PS]))
                goto bad;
        if (suword((caddr_t)--usp, regs[PC]))