PERFORCE change 92019 for review

Wayne Salamon wsalamon at FreeBSD.org
Sat Feb 18 16:22:29 PST 2006


http://perforce.freebsd.org/chv.cgi?CH=92019

Change 92019 by wsalamon at gretsch on 2006/02/19 00:22:10

	Cleanup: line lengths, remove extraneous semi-colon

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#26 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#26 (text+ko) ====

@@ -71,7 +71,6 @@
 #include <machine/stdarg.h>
 
 #include <security/audit/audit.h>
-#include <bsm/audit_kevents.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
@@ -694,9 +693,7 @@
 	fdrop(fp, td);
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
-
 	AUDIT_ARG(vnode, vp, ARG_VNODE1);
-
 	if (vp->v_type != VDIR)
 		error = ENOTDIR;
 #ifdef MAC
@@ -1193,7 +1190,6 @@
 
 	AUDIT_ARG(mode, mode);
 	AUDIT_ARG(dev, dev);
-
 	switch (mode & S_IFMT) {
 	case S_IFCHR:
 	case S_IFBLK:
@@ -2544,8 +2540,7 @@
 	int vfslocked;
 
 	AUDIT_ARG(mode, mode);
-	NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path,
-	    td);
+	NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td);
 	if ((error = namei(&nd)) != 0)
 		return (error);
 	vfslocked = NDHASGIANT(&nd);
@@ -2688,8 +2683,7 @@
 	int vfslocked;
 
 	AUDIT_ARG(owner, uid, gid);
-	NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path,
-	    td);
+	NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td);
 	if ((error = namei(&nd)) != 0)
 		return (error);
 	vfslocked = NDHASGIANT(&nd);
@@ -2732,8 +2726,7 @@
 	int vfslocked;
 
 	AUDIT_ARG(owner, uid, gid);
-	NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path,
-	    td);
+	NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td);
 	if ((error = namei(&nd)) != 0)
 		return (error);
 	vfslocked = NDHASGIANT(&nd);
@@ -3198,7 +3191,7 @@
 	int vfslocked;
 	int error;
 
-	AUDIT_ARG(fd, uap->fd);;
+	AUDIT_ARG(fd, uap->fd);
 	if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0)
 		return (error);
 	vp = fp->f_vnode;


More information about the trustedbsd-cvs mailing list