xnu-792.18.15.tar.gz

[apple/xnu.git] / bsd / bsm / audit_record.h

diff --git a/bsd/bsm/audit_record.h b/bsd/bsm/audit_record.h
index 3a64eabd0e5f47bddf512266f76a534ef238e578..a3f159718c289be3ccc354450161a5afa67ee3c3 100644 (file)
--- a/bsd/bsm/audit_record.h
+++ b/bsd/bsm/audit_record.h
@@ -1,14 +1,17 @@
 /*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2004 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +21,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
@@ -26,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #include <sys/vnode.h>
-#include <sys/ipc.h>
+#include <sys/types.h>
 #include <sys/un.h>
 #include <sys/event.h>
 #include <netinet/in_systm.h>
@@ -52,19 +55,19 @@
 
 #define ADD_U_INT16(loc, val) \
         do { \
-               memcpy(loc, (u_char *)&val, sizeof(u_int16_t));\
+               memcpy(loc, (const u_char *)&val, sizeof(u_int16_t));\
                 loc += sizeof(u_int16_t); \
         }while(0)
 
 #define ADD_U_INT32(loc, val) \
         do { \
-               memcpy(loc, (u_char *)&val, sizeof(u_int32_t));\
+               memcpy(loc, (const u_char *)&val, sizeof(u_int32_t));\
                 loc += sizeof(u_int32_t); \
         }while(0)
 
 #define ADD_U_INT64(loc, val)\
         do {\
-               memcpy(loc, (u_char *)&val, sizeof(u_int64_t));\
+               memcpy(loc, (const u_char *)&val, sizeof(u_int64_t));\
                 loc += sizeof(u_int64_t); \
         }while(0)
 
@@ -243,9 +246,9 @@ token_t                     *au_to_me(void);
 token_t                        *au_to_arg(char n, char *text, u_int32_t v);
 token_t                        *au_to_arg32(char n, char *text, u_int32_t v);
 token_t                        *au_to_arg64(char n, char *text, u_int64_t v);
-token_t                        *au_to_attr(struct vattr *attr);
-token_t                        *au_to_attr32(struct vattr *attr);
-token_t                        *au_to_attr64(struct vattr *attr);
+token_t                        *au_to_attr(struct vnode_attr *attr);
+token_t                        *au_to_attr32(struct vnode_attr *attr);
+token_t                        *au_to_attr64(struct vnode_attr *attr);
 token_t                        *au_to_data(char unit_print, char unit_type,
                                char unit_count, char *p);
 token_t                        *au_to_exit(int retval, int err);