PERFORCE change 153434 for review

[Edward Tomasz Napierala]

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

Change 153434 by trasz at trasz_victim7 on 2008/11/24 14:10:35

	Style fixes.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#27 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#27 (text+ko) ====

@@ -137,14 +137,14 @@
 };
 typedef struct acl_t_struct *acl_t;
 
-#define ACL_MAGIC		0x5452535a
+#define	ACL_MAGIC		0x5452535a
 
 /*
  * Possible valid values for ats_brand field.
  */
-#define ACL_BRAND_UNKNOWN	0
-#define ACL_BRAND_POSIX		1
-#define ACL_BRAND_NFS4		2
+#define	ACL_BRAND_UNKNOWN	0
+#define	ACL_BRAND_POSIX		1
+#define	ACL_BRAND_NFS4		2
 
 /*
  * Possible valid values for ae_tag field.  For explanation, see acl(9).
@@ -157,15 +157,15 @@
 #define	ACL_MASK		0x00000010
 #define	ACL_OTHER		0x00000020
 #define	ACL_OTHER_OBJ		ACL_OTHER
-#define ACL_EVERYONE		0x00000040
+#define	ACL_EVERYONE		0x00000040
 
 /*
  * Possible valid values for ae_extended field.
  */
-#define ACL_EXTENDED_ALLOW	0x00000100
-#define ACL_EXTENDED_DENY	0x00000200
-#define ACL_EXTENDED_AUDIT	0x00000400
-#define ACL_EXTENDED_ALARM	0x00000800
+#define	ACL_EXTENDED_ALLOW	0x00000100
+#define	ACL_EXTENDED_DENY	0x00000200
+#define	ACL_EXTENDED_AUDIT	0x00000400
+#define	ACL_EXTENDED_ALARM	0x00000800
 
 /*
  * Possible valid values for acl_type_t arguments.  First two
@@ -191,33 +191,33 @@
  * Possible flags in ae_perm field for NFSv4 ACLs.
  * XXX: Change values of these to match rfc3530.
  */
-#define ACL_READ_DATA		0x00010000
-#define ACL_LIST_DIRECTORY	0x00010000
-#define ACL_WRITE_DATA		0x00020000
-#define ACL_ADD_FILE		0x00020000
-#define ACL_APPEND_DATA		0x00040000
-#define ACL_ADD_SUBDIRECTORY	0x00040000
-#define ACL_READ_NAMED_ATTRS	0x00080000
-#define ACL_READ_EXTATTRIBUTES	ACL_READ_NAMED_ATTRS /* Darwin compatibility. */
-#define ACL_WRITE_NAMED_ATTRS	0x00100000
-#define ACL_WRITE_EXTATTRIBUTES	ACL_WRITE_NAMED_ATTRS /* Darwin compatibility. */
+#define	ACL_READ_DATA		0x00010000
+#define	ACL_LIST_DIRECTORY	0x00010000
+#define	ACL_WRITE_DATA		0x00020000
+#define	ACL_ADD_FILE		0x00020000
+#define	ACL_APPEND_DATA		0x00040000
+#define	ACL_ADD_SUBDIRECTORY	0x00040000
+#define	ACL_READ_NAMED_ATTRS	0x00080000
+#define	ACL_READ_EXTATTRIBUTES	ACL_READ_NAMED_ATTRS /* Darwin compatibility. */
+#define	ACL_WRITE_NAMED_ATTRS	0x00100000
+#define	ACL_WRITE_EXTATTRIBUTES	ACL_WRITE_NAMED_ATTRS /* Darwin compatibility. */
 #ifdef XXX_conflicting_defines
-#define ACL_EXECUTE		0x00200000
+#define	ACL_EXECUTE		0x00200000
 #endif
-#define ACL_SEARCH		ACL_EXECUTE /* Darwin compatibility. */
-#define ACL_DELETE_CHILD	0x00400000
-#define ACL_READ_ATTRIBUTES	0x00800000
-#define ACL_WRITE_ATTRIBUTES	0x01000000
-#define ACL_DELETE		0x02000000
-#define ACL_READ_ACL		0x04000000
-#define ACL_READ_SECURITY	ACL_READ_ACL /* Darwin compatibility. */
-#define ACL_WRITE_ACL		0x08000000
-#define ACL_WRITE_SECURITY	ACL_WRITE_ACL /* Darwin compatibility. */
-#define ACL_WRITE_OWNER		0x10000000
-#define ACL_CHANGE_OWNER	ACL_WRITE_OWNER /* Darwin compatibility. */
-#define ACL_SYNCHRONIZE		0x20000000
+#define	ACL_SEARCH		ACL_EXECUTE /* Darwin compatibility. */
+#define	ACL_DELETE_CHILD	0x00400000
+#define	ACL_READ_ATTRIBUTES	0x00800000
+#define	ACL_WRITE_ATTRIBUTES	0x01000000
+#define	ACL_DELETE		0x02000000
+#define	ACL_READ_ACL		0x04000000
+#define	ACL_READ_SECURITY	ACL_READ_ACL /* Darwin compatibility. */
+#define	ACL_WRITE_ACL		0x08000000
+#define	ACL_WRITE_SECURITY	ACL_WRITE_ACL /* Darwin compatibility. */
+#define	ACL_WRITE_OWNER		0x10000000
+#define	ACL_CHANGE_OWNER	ACL_WRITE_OWNER /* Darwin compatibility. */
+#define	ACL_SYNCHRONIZE		0x20000000
 
-#define ACL_NFS4_PERM_BITS	(ACL_READ_DATA | ACL_WRITE_DATA | ACL_APPEND_DATA | \
+#define	ACL_NFS4_PERM_BITS	(ACL_READ_DATA | ACL_WRITE_DATA | ACL_APPEND_DATA | \
     ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | ACL_EXECUTE | ACL_DELETE_CHILD | \
     ACL_READ_ATTRIBUTES | ACL_WRITE_ATTRIBUTES | ACL_DELETE | ACL_READ_ACL | \
     ACL_WRITE_ACL | ACL_WRITE_OWNER | ACL_SYNCHRONIZE)
@@ -237,15 +237,15 @@
  *
  * #define ACL_FLAG_DEFER_INHERIT
  */
-#define ACL_ENTRY_FILE_INHERIT		0x00000001
-#define ACL_ENTRY_DIRECTORY_INHERIT	0x00000002
-#define ACL_ENTRY_LIMIT_INHERIT		0x00000004 /* "NO_PROPAGATE_INHERIT" */
-#define ACL_ENTRY_ONLY_INHERIT		0x00000008 /* "INHERIT_ONLY" */
-#define ACL_ENTRY_SUCCESSFUL_ACCESS	0x00000010
-#define ACL_ENTRY_FAILED_ACCESS		0x00000020
-#define ACL_ENTRY_INHERITED		0x00000080 /* Currently unused. */
+#define	ACL_ENTRY_FILE_INHERIT		0x00000001
+#define	ACL_ENTRY_DIRECTORY_INHERIT	0x00000002
+#define	ACL_ENTRY_LIMIT_INHERIT		0x00000004 /* "NO_PROPAGATE_INHERIT" */
+#define	ACL_ENTRY_ONLY_INHERIT		0x00000008 /* "INHERIT_ONLY" */
+#define	ACL_ENTRY_SUCCESSFUL_ACCESS	0x00000010
+#define	ACL_ENTRY_FAILED_ACCESS		0x00000020
+#define	ACL_ENTRY_INHERITED		0x00000080 /* Currently unused. */
 
-#define ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | \
+#define	ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | \
     ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \
     ACL_ENTRY_FAILED_ACCESS)
 
@@ -258,9 +258,9 @@
 /*
  * Possible values for _flags parameter in acl_to_text_np(3).
  */
-#define ACL_TEXT_VERBOSE	0x01
-#define ACL_TEXT_NUMERIC_IDS	0x02
-#define ACL_TEXT_APPEND_ID	0x04
+#define	ACL_TEXT_VERBOSE	0x01
+#define	ACL_TEXT_NUMERIC_IDS	0x02
+#define	ACL_TEXT_APPEND_ID	0x04
 
 /*
  * POSIX.1e ACLs are capable of expressing the read, write, and execute bits