diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1998-05-31 18:11:03 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1998-05-31 18:11:03 +0000 |
| commit | 6301c8c3307fca2dc48935774582bce5c379dfd6 (patch) | |
| tree | d4a18b0cbcda65582733efdb148f804dcca91cf4 | |
| parent | 1da42e389c32b913f92033d7b48feedd551045a1 (diff) | |
Notes
| -rw-r--r-- | sys/nfs/nfs_common.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_subs.c | 6 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_subs.c | 6 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_srvsubs.c | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 987ee97a31ac..b3aeb0a52fdf 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 - * $Id: nfs_subs.c,v 1.57 1998/05/31 17:48:04 peter Exp $ + * $Id: nfs_subs.c,v 1.58 1998/05/31 18:09:18 peter Exp $ */ /* @@ -866,8 +866,10 @@ nfsm_uiotombuf(uiop, mq, siz, bpos) int uiosiz, clflg, rem; char *cp; +#ifdef DIAGNOSTIC if (uiop->uio_iovcnt != 1) panic("nfsm_uiotombuf: iovcnt != 1"); +#endif if (siz > MLEN) /* or should it >= MCLBYTES ?? */ clflg = 1; @@ -1034,7 +1036,7 @@ nfsm_strtmbuf(mb, bpos, cp, siz) const char *cp; long siz; { - register struct mbuf *m1 = 0, *m2; + register struct mbuf *m1 = NULL, *m2; long left, xfer, len, tlen; u_long *tl; int putsize; diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 987ee97a31ac..b3aeb0a52fdf 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 - * $Id: nfs_subs.c,v 1.57 1998/05/31 17:48:04 peter Exp $ + * $Id: nfs_subs.c,v 1.58 1998/05/31 18:09:18 peter Exp $ */ /* @@ -866,8 +866,10 @@ nfsm_uiotombuf(uiop, mq, siz, bpos) int uiosiz, clflg, rem; char *cp; +#ifdef DIAGNOSTIC if (uiop->uio_iovcnt != 1) panic("nfsm_uiotombuf: iovcnt != 1"); +#endif if (siz > MLEN) /* or should it >= MCLBYTES ?? */ clflg = 1; @@ -1034,7 +1036,7 @@ nfsm_strtmbuf(mb, bpos, cp, siz) const char *cp; long siz; { - register struct mbuf *m1 = 0, *m2; + register struct mbuf *m1 = NULL, *m2; long left, xfer, len, tlen; u_long *tl; int putsize; diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 987ee97a31ac..b3aeb0a52fdf 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 - * $Id: nfs_subs.c,v 1.57 1998/05/31 17:48:04 peter Exp $ + * $Id: nfs_subs.c,v 1.58 1998/05/31 18:09:18 peter Exp $ */ /* @@ -866,8 +866,10 @@ nfsm_uiotombuf(uiop, mq, siz, bpos) int uiosiz, clflg, rem; char *cp; +#ifdef DIAGNOSTIC if (uiop->uio_iovcnt != 1) panic("nfsm_uiotombuf: iovcnt != 1"); +#endif if (siz > MLEN) /* or should it >= MCLBYTES ?? */ clflg = 1; @@ -1034,7 +1036,7 @@ nfsm_strtmbuf(mb, bpos, cp, siz) const char *cp; long siz; { - register struct mbuf *m1 = 0, *m2; + register struct mbuf *m1 = NULL, *m2; long left, xfer, len, tlen; u_long *tl; int putsize; diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index 987ee97a31ac..b3aeb0a52fdf 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 - * $Id: nfs_subs.c,v 1.57 1998/05/31 17:48:04 peter Exp $ + * $Id: nfs_subs.c,v 1.58 1998/05/31 18:09:18 peter Exp $ */ /* @@ -866,8 +866,10 @@ nfsm_uiotombuf(uiop, mq, siz, bpos) int uiosiz, clflg, rem; char *cp; +#ifdef DIAGNOSTIC if (uiop->uio_iovcnt != 1) panic("nfsm_uiotombuf: iovcnt != 1"); +#endif if (siz > MLEN) /* or should it >= MCLBYTES ?? */ clflg = 1; @@ -1034,7 +1036,7 @@ nfsm_strtmbuf(mb, bpos, cp, siz) const char *cp; long siz; { - register struct mbuf *m1 = 0, *m2; + register struct mbuf *m1 = NULL, *m2; long left, xfer, len, tlen; u_long *tl; int putsize; |