From f97182acf8e40abed743e51434374e0a3d4b5139 Mon Sep 17 00:00:00 2001 From: Alfred Perlstein Date: Sat, 14 Dec 2002 08:18:06 +0000 Subject: [PATCH] unwrap lines made short enough by SCARGS removal --- sys/kern/kern_acct.c | 3 +-- sys/kern/kern_acl.c | 9 +++------ sys/kern/kern_linker.c | 9 +++------ sys/kern/subr_acl_posix1e.c | 9 +++------ sys/kern/vfs_acl.c | 9 +++------ sys/kern/vfs_extattr.c | 12 ++++-------- sys/kern/vfs_mount.c | 6 ++---- sys/kern/vfs_syscalls.c | 12 ++++-------- 8 files changed, 23 insertions(+), 46 deletions(-) diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index 04be57057c9f..4635b9924550 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -140,8 +140,7 @@ acct(td, uap) * appending and make sure it's a 'normal'. */ if (uap->path != NULL) { - NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, - td); + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); flags = FWRITE | O_APPEND; error = vn_open(&nd, &flags, 0); if (error) diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c index b1944543fa81..d93938f82265 100644 --- a/sys/kern/kern_acl.c +++ b/sys/kern/kern_acl.c @@ -692,8 +692,7 @@ __acl_get_file(struct thread *td, struct __acl_get_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_get_acl(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_get_acl(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -715,8 +714,7 @@ __acl_set_file(struct thread *td, struct __acl_set_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_set_acl(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_set_acl(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -826,8 +824,7 @@ __acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_aclcheck(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_aclcheck(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index f387959b979e..c1a7d3acd566 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -754,8 +754,7 @@ kldload(struct thread *td, struct kldload_args *uap) goto out; pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - if ((error = copyinstr(uap->file, pathname, MAXPATHLEN, - NULL)) != 0) + if ((error = copyinstr(uap->file, pathname, MAXPATHLEN, NULL)) != 0) goto out; /* @@ -841,8 +840,7 @@ kldfind(struct thread *td, struct kldfind_args *uap) td->td_retval[0] = -1; pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - if ((error = copyinstr(uap->file, pathname, MAXPATHLEN, - NULL)) != 0) + if ((error = copyinstr(uap->file, pathname, MAXPATHLEN, NULL)) != 0) goto out; filename = linker_basename(pathname); @@ -1026,8 +1024,7 @@ kldsym(struct thread *td, struct kldsym_args *uap) LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) { lookup.symvalue = (uintptr_t) symval.value; lookup.symsize = symval.size; - error = copyout(&lookup, uap->data, - sizeof(lookup)); + error = copyout(&lookup, uap->data, sizeof(lookup)); } else error = ENOENT; } else { diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c index b1944543fa81..d93938f82265 100644 --- a/sys/kern/subr_acl_posix1e.c +++ b/sys/kern/subr_acl_posix1e.c @@ -692,8 +692,7 @@ __acl_get_file(struct thread *td, struct __acl_get_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_get_acl(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_get_acl(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -715,8 +714,7 @@ __acl_set_file(struct thread *td, struct __acl_set_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_set_acl(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_set_acl(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -826,8 +824,7 @@ __acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_aclcheck(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_aclcheck(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index b1944543fa81..d93938f82265 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -692,8 +692,7 @@ __acl_get_file(struct thread *td, struct __acl_get_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_get_acl(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_get_acl(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -715,8 +714,7 @@ __acl_set_file(struct thread *td, struct __acl_set_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_set_acl(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_set_acl(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -826,8 +824,7 @@ __acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); error = namei(&nd); if (error == 0) { - error = vacl_aclcheck(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_aclcheck(td, nd.ni_vp, uap->type, uap->aclp); NDFREE(&nd, 0); } mtx_unlock(&Giant); diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 8b49c16c2bcd..e994c812418a 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -199,8 +199,7 @@ quotactl(td, uap) vrele(nd.ni_vp); if (error) return (error); - error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, - uap->arg, td); + error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, uap->arg, td); vn_finished_write(mp); return (error); } @@ -538,8 +537,7 @@ chroot(td, uap) error = suser_cred(td->td_ucred, PRISON_ROOT); if (error) return (error); - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, - uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); mtx_lock(&Giant); if ((error = change_dir(&nd, td)) != 0) goto error; @@ -2297,8 +2295,7 @@ fchown(td, uap) if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vp = (struct vnode *)fp->f_data; - error = setfown(td, (struct vnode *)fp->f_data, - uap->uid, uap->gid); + error = setfown(td, (struct vnode *)fp->f_data, uap->uid, uap->gid); fdrop(fp, td); return (error); } @@ -3355,8 +3352,7 @@ revoke(td, uap) int error; struct nameidata nd; - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) return (error); vp = nd.ni_vp; diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 166f05e28546..5fa039981fe2 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -815,8 +815,7 @@ mount(td, uap) if (error == 0) error = copyinstr(uap->path, fspath, MNAMELEN, NULL); if (error == 0) - error = vfs_mount(td, fstype, fspath, uap->flags, - uap->data); + error = vfs_mount(td, fstype, fspath, uap->flags, uap->data); free(fstype, M_TEMP); free(fspath, M_TEMP); return (error); @@ -1198,8 +1197,7 @@ unmount(td, uap) int error; struct nameidata nd; - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, - uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) return (error); vp = nd.ni_vp; diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 8b49c16c2bcd..e994c812418a 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -199,8 +199,7 @@ quotactl(td, uap) vrele(nd.ni_vp); if (error) return (error); - error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, - uap->arg, td); + error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, uap->arg, td); vn_finished_write(mp); return (error); } @@ -538,8 +537,7 @@ chroot(td, uap) error = suser_cred(td->td_ucred, PRISON_ROOT); if (error) return (error); - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, - uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); mtx_lock(&Giant); if ((error = change_dir(&nd, td)) != 0) goto error; @@ -2297,8 +2295,7 @@ fchown(td, uap) if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vp = (struct vnode *)fp->f_data; - error = setfown(td, (struct vnode *)fp->f_data, - uap->uid, uap->gid); + error = setfown(td, (struct vnode *)fp->f_data, uap->uid, uap->gid); fdrop(fp, td); return (error); } @@ -3355,8 +3352,7 @@ revoke(td, uap) int error; struct nameidata nd; - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) return (error); vp = nd.ni_vp;