diff options
| author | Matthew Dillon <dillon@FreeBSD.org> | 1999-01-27 22:42:27 +0000 |
|---|---|---|
| committer | Matthew Dillon <dillon@FreeBSD.org> | 1999-01-27 22:42:27 +0000 |
| commit | 831a80b0d5d50e416fe5e4b237d3a9fd4eea00b8 (patch) | |
| tree | f992000fa6fa60b61396de4df4bebeada04cda79 /sys/nfs | |
| parent | be317f36a9bf314d51d60720160fc0677390c728 (diff) | |
| download | src-831a80b0d5d50e416fe5e4b237d3a9fd4eea00b8.tar.gz src-831a80b0d5d50e416fe5e4b237d3a9fd4eea00b8.zip | |
Fix warnings in preparation for adding -Wall -Wcast-qual to the
kernel compile
Notes
Notes:
svn path=/head/; revision=43305
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_common.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_subs.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_syscalls.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 6c9cfb7a4c0f..5544bf253a56 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.70 1999/01/05 18:49:58 eivind Exp $ + * $Id: nfs_subs.c,v 1.71 1999/01/21 08:29:07 dillon Exp $ */ /* @@ -1254,7 +1254,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) md = *mdp; t1 = (mtod(md, caddr_t) + md->m_len) - *dposp; - if (error = nfsm_disct(mdp, dposp, NFSX_FATTR(v3), t1, &cp2)) + if ((error = nfsm_disct(mdp, dposp, NFSX_FATTR(v3), t1, &cp2)) != 0) return (error); fp = (struct nfs_fattr *)cp2; if (v3) { @@ -2032,7 +2032,7 @@ netaddr_match(family, haddr, nam) return (0); } -static nfsuint64 nfs_nullcookie = { 0, 0 }; +static nfsuint64 nfs_nullcookie = { { 0, 0 } }; /* * This function finds the directory cookie that corresponds to the * logical byte offset given. diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 6c9cfb7a4c0f..5544bf253a56 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.70 1999/01/05 18:49:58 eivind Exp $ + * $Id: nfs_subs.c,v 1.71 1999/01/21 08:29:07 dillon Exp $ */ /* @@ -1254,7 +1254,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) md = *mdp; t1 = (mtod(md, caddr_t) + md->m_len) - *dposp; - if (error = nfsm_disct(mdp, dposp, NFSX_FATTR(v3), t1, &cp2)) + if ((error = nfsm_disct(mdp, dposp, NFSX_FATTR(v3), t1, &cp2)) != 0) return (error); fp = (struct nfs_fattr *)cp2; if (v3) { @@ -2032,7 +2032,7 @@ netaddr_match(family, haddr, nam) return (0); } -static nfsuint64 nfs_nullcookie = { 0, 0 }; +static nfsuint64 nfs_nullcookie = { { 0, 0 } }; /* * This function finds the directory cookie that corresponds to the * logical byte offset given. diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index 8b85b9b22bd9..5050ec8f1ed0 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_syscalls.c,v 1.43 1998/09/01 02:31:52 luoqi Exp $ + * $Id: nfs_syscalls.c,v 1.44 1998/12/07 21:58:44 archie Exp $ */ #include <sys/param.h> @@ -791,7 +791,7 @@ nfsrv_zapsock(slp) if (slp->ns_nam) FREE(slp->ns_nam, M_SONAME); m_freem(slp->ns_raw); - while (rec = STAILQ_FIRST(&slp->ns_rec)) { + while ((rec = STAILQ_FIRST(&slp->ns_rec)) != NULL) { STAILQ_REMOVE_HEAD(&slp->ns_rec, nr_link); if (rec->nr_address) FREE(rec->nr_address, M_SONAME); |