diff options
| author | peter <peter@FreeBSD.org> | 1998-05-31 18:11:03 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-05-31 18:11:03 +0000 |
| commit | 66a3e6b96c8976dd313815b455b57ab36f640b0c (patch) | |
| tree | 5d7d5b6fd11060fec1864e327289baeea63f7577 /sys/nfs/nfs_subs.c | |
| parent | 32e00d316d5f718b6f0491f1f0c50327c4ba64a7 (diff) | |
| download | FreeBSD-src-66a3e6b96c8976dd313815b455b57ab36f640b0c.zip FreeBSD-src-66a3e6b96c8976dd313815b455b57ab36f640b0c.tar.gz | |
#ifdef a diagnostic panic, plus another missed costmetic change.
Obtained from: NetBSD
Diffstat (limited to 'sys/nfs/nfs_subs.c')
| -rw-r--r-- | sys/nfs/nfs_subs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 987ee97..b3aeb0a 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; |
