diff options
author | Robert Watson <rwatson@FreeBSD.org> | 2004-04-04 19:13:35 +0000 |
---|---|---|
committer | Robert Watson <rwatson@FreeBSD.org> | 2004-04-04 19:13:35 +0000 |
commit | 2a8021f14baf577ceb400d1a98b4db5be4bddc86 (patch) | |
tree | 5796420c2c52152aa7d7154f47fe20dbfa920f1a /sys/nfsserver | |
parent | 37a35e4a60c858249bb9cd20af8abeb26d8c6e05 (diff) | |
download | src-2a8021f14baf577ceb400d1a98b4db5be4bddc86.tar.gz src-2a8021f14baf577ceb400d1a98b4db5be4bddc86.zip |
Explicitly compare pointers with NULL rather than treating a pointer as
a boolean directly, use NULL instead of 0.
Notes
Notes:
svn path=/head/; revision=127851
Diffstat (limited to 'sys/nfsserver')
-rw-r--r-- | sys/nfsserver/nfs_srvsock.c | 10 | ||||
-rw-r--r-- | sys/nfsserver/nfs_syscalls.c | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index 241881d2881f..95ab976afd62 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -434,7 +434,8 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag) * to an nfsd so that there is feedback to the TCP layer that * the nfs servers are heavily loaded. */ - if (STAILQ_FIRST(&slp->ns_rec) && waitflag == M_DONTWAIT) { + if (STAILQ_FIRST(&slp->ns_rec) != NULL && + waitflag == M_DONTWAIT) { slp->ns_flag |= SLP_NEEDQ; goto dorecs; } @@ -512,8 +513,8 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag) */ dorecs: if (waitflag == M_DONTWAIT && - (STAILQ_FIRST(&slp->ns_rec) - || (slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN)))) + (STAILQ_FIRST(&slp->ns_rec) != NULL || + (slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN)))) nfsrv_wakenfsd(slp); } @@ -662,7 +663,8 @@ nfsrv_dorec(struct nfssvc_sock *slp, struct nfsd *nfsd, int error; *ndp = NULL; - if ((slp->ns_flag & SLP_VALID) == 0 || !STAILQ_FIRST(&slp->ns_rec)) + if ((slp->ns_flag & SLP_VALID) == 0 || + STAILQ_FIRST(&slp->ns_rec) == NULL) return (ENOBUFS); rec = STAILQ_FIRST(&slp->ns_rec); STAILQ_REMOVE_HEAD(&slp->ns_rec, nr_link); diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c index 25330383bab0..63acf7c08170 100644 --- a/sys/nfsserver/nfs_syscalls.c +++ b/sys/nfsserver/nfs_syscalls.c @@ -336,7 +336,7 @@ nfssvc_nfsd(struct thread *td) break; } } - if (slp == 0) + if (slp == NULL) nfsd_head_flag &= ~NFSD_CHECKSLP; } if ((slp = nfsd->nfsd_slp) == NULL) @@ -652,7 +652,8 @@ nfsrv_init(int terminating) panic("nfsd init"); nfssvc_sockhead_flag |= SLP_INIT; if (terminating) { - for (slp = TAILQ_FIRST(&nfssvc_sockhead); slp != 0; slp = nslp){ + for (slp = TAILQ_FIRST(&nfssvc_sockhead); slp != NULL; + slp = nslp) { nslp = TAILQ_NEXT(slp, ns_chain); if (slp->ns_flag & SLP_VALID) nfsrv_zapsock(slp); |