diff options
| author | pjd <pjd@FreeBSD.org> | 2012-06-11 16:08:03 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2012-06-11 16:08:03 +0000 |
| commit | 859bb04daaa6b7e432d6e33607ad82454a2cf75e (patch) | |
| tree | a36e5381aa0e79f8b30bb78e845b3a0fdd11c2b4 /sys/kern/uipc_syscalls.c | |
| parent | b1b87d698b0d48ebcdc36b4df376881001fe2df5 (diff) | |
| download | FreeBSD-src-859bb04daaa6b7e432d6e33607ad82454a2cf75e.zip FreeBSD-src-859bb04daaa6b7e432d6e33607ad82454a2cf75e.tar.gz | |
Style fixes and simplifications.
MFC after: 1 month
Diffstat (limited to 'sys/kern/uipc_syscalls.c')
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 719d298..00f45e0 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -134,8 +134,7 @@ getsock_cap(struct filedesc *fdp, int fd, cap_rights_t rights, int error; #endif - fp = NULL; - if ((fdp == NULL) || ((fp = fget_unlocked(fdp, fd)) == NULL)) + if (fdp == NULL || (fp = fget_unlocked(fdp, fd)) == NULL) return (EBADF); #ifdef CAPABILITIES /* @@ -179,7 +178,6 @@ sys_socket(td, uap) int protocol; } */ *uap; { - struct filedesc *fdp; struct socket *so; struct file *fp; int fd, error; @@ -191,7 +189,6 @@ sys_socket(td, uap) if (error) return (error); #endif - fdp = td->td_proc->p_fd; error = falloc(td, &fp, &fd, 0); if (error) return (error); @@ -199,7 +196,7 @@ sys_socket(td, uap) error = socreate(uap->domain, &so, uap->type, uap->protocol, td->td_ucred, td); if (error) { - fdclose(fdp, fp, fd, td); + fdclose(td->td_proc->p_fd, fp, fd, td); } else { finit(fp, FREAD | FWRITE, DTYPE_SOCKET, so, &socketops); td->td_retval[0] = fd; @@ -2313,14 +2310,12 @@ sys_sctp_peeloff(td, uap) } */ *uap; { #if (defined(INET) || defined(INET6)) && defined(SCTP) - struct filedesc *fdp; struct file *nfp = NULL; int error; struct socket *head, *so; int fd; u_int fflag; - fdp = td->td_proc->p_fd; AUDIT_ARG_FD(uap->sd); error = fgetsock(td, uap->sd, CAP_PEELOFF, &head, &fflag); if (error) @@ -2378,7 +2373,7 @@ noconnection: * out from under us. */ if (error) - fdclose(fdp, nfp, fd, td); + fdclose(td->td_proc->p_fd, nfp, fd, td); /* * Release explicitly held references before returning. |
