d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unwrap lines made short enough by SCARGS removal

Browse Source
This commit is contained in:
Alfred Perlstein 2002-12-14 08:18:06 +00:00
parent 1ab4789dc2
commit f97182acf8
8 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/kern/kern_acct.c
View File

@ -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)

9
sys/kern/kern_acl.c
View File

@ -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);

9
sys/kern/kern_linker.c
View File

@ -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 {

9
sys/kern/subr_acl_posix1e.c
View File

@ -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);

9
sys/kern/vfs_acl.c
View File

@ -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);

12
sys/kern/vfs_extattr.c
View File

@ -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;

6
sys/kern/vfs_mount.c
View File

@ -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;

12
sys/kern/vfs_syscalls.c
View File

@ -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;