PERFORCE change 90641 for review

[Robert Watson]

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

Change 90641 by rwatson at rwatson_peppercorn on 2006/01/29 20:44:38

	Indent less, line wrap more.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#14 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#14 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#13 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#14 $
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
@@ -226,108 +226,99 @@
 struct vnode_au_info;
 #endif
 
-int			au_open(void);
-int			au_write(int d, token_t *m);
-int			au_close(int d, int keep, short event);
-int			au_close_buffer(int d, short event, u_char *buffer,
-					size_t *buflen);
+int	 au_open(void);
+int	 au_write(int d, token_t *m);
+int	 au_close(int d, int keep, short event);
+int	 au_close_buffer(int d, short event, u_char *buffer, size_t *buflen);
+
 #if defined(KERNEL) || defined(_KERNEL)
-token_t			*au_to_file(char *file, struct timeval tm);
+token_t	*au_to_file(char *file, struct timeval tm);
 #else
-token_t			*au_to_file(char *file);
+token_t	*au_to_file(char *file);
 #endif
+
 #if defined(KERNEL) || defined(_KERNEL)
-token_t			*au_to_header(int rec_size, au_event_t e_type,
-					au_emod_t e_mod, struct timeval tm);
-token_t			*au_to_header32(int rec_size, au_event_t e_type,
-					au_emod_t e_mod, struct timeval tm);
+token_t	*au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod,
+	    struct timeval tm);
+token_t	*au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod,
+	    struct timeval tm);
 #else
-token_t			*au_to_header(int rec_size, au_event_t e_type,
-					au_emod_t e_mod);
-token_t			*au_to_header32(int rec_size, au_event_t e_type,
-					au_emod_t e_mod);
+token_t	*au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod);
+token_t	*au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod);
 #endif
-token_t			*au_to_header64(int rec_size, au_event_t e_type,
-					au_emod_t e_mod);
-token_t			*au_to_me(void);
+
+token_t	*au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod);
+token_t	*au_to_me(void);
+token_t	*au_to_arg(char n, char *text, uint32_t v);
+token_t	*au_to_arg32(char n, char *text, uint32_t v);
+token_t	*au_to_arg64(char n, char *text, uint64_t v);
 
-token_t			*au_to_arg(char n, char *text, uint32_t v);
-token_t			*au_to_arg32(char n, char *text, uint32_t v);
-token_t			*au_to_arg64(char n, char *text, uint64_t v);
 #if defined(_KERNEL) || defined(KERNEL)
-token_t			*au_to_attr(struct vnode_au_info *vni);
-token_t			*au_to_attr32(struct vnode_au_info *vni);
-token_t			*au_to_attr64(struct vnode_au_info *vni);
+token_t	*au_to_attr(struct vnode_au_info *vni);
+token_t	*au_to_attr32(struct vnode_au_info *vni);
+token_t	*au_to_attr64(struct vnode_au_info *vni);
 #endif
-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);
-token_t			*au_to_groups(int *groups);
-token_t			*au_to_newgroups(uint16_t n, gid_t *groups);
-token_t			*au_to_in_addr(struct in_addr *internet_addr);
-token_t			*au_to_in_addr_ex(struct in6_addr *internet_addr);
-token_t			*au_to_ip(struct ip *ip);
-token_t			*au_to_ipc(char type, int id);
-token_t			*au_to_ipc_perm(struct ipc_perm *perm);
-token_t			*au_to_iport(uint16_t iport);
-token_t			*au_to_opaque(char *data, uint16_t bytes);
-token_t			*au_to_path(char *path);
-token_t			*au_to_process(au_id_t auid, uid_t euid, gid_t egid,
-				uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_t *tid);
-token_t			*au_to_process32(au_id_t auid, uid_t euid, gid_t egid,
-				uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_t *tid);
-token_t			*au_to_process64(au_id_t auid, uid_t euid, gid_t egid,
-				uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_t *tid);
-token_t			*au_to_process_ex(au_id_t auid, uid_t euid,
-				gid_t egid, uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_addr_t *tid);
-token_t			*au_to_process32_ex(au_id_t auid, uid_t euid,
-				gid_t egid, uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_addr_t *tid);
-token_t			*au_to_process64_ex(au_id_t auid, uid_t euid,
-				gid_t egid, uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_addr_t *tid);
-token_t			*au_to_return(char status, uint32_t ret);
-token_t			*au_to_return32(char status, uint32_t ret);
-token_t			*au_to_return64(char status, uint64_t ret);
-token_t			*au_to_seq(long audit_count);
+
+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);
+token_t	*au_to_groups(int *groups);
+token_t	*au_to_newgroups(uint16_t n, gid_t *groups);
+token_t	*au_to_in_addr(struct in_addr *internet_addr);
+token_t	*au_to_in_addr_ex(struct in6_addr *internet_addr);
+token_t	*au_to_ip(struct ip *ip);
+token_t	*au_to_ipc(char type, int id);
+token_t	*au_to_ipc_perm(struct ipc_perm *perm);
+token_t	*au_to_iport(uint16_t iport);
+token_t	*au_to_opaque(char *data, uint16_t bytes);
+token_t	*au_to_path(char *path);
+token_t	*au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
+token_t	*au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
+token_t	*au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
+token_t	*au_to_process_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
+token_t	*au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid,
+	    uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid,
+	    au_tid_addr_t *tid);
+token_t	*au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
+token_t	*au_to_return(char status, uint32_t ret);
+token_t	*au_to_return32(char status, uint32_t ret);
+token_t	*au_to_return64(char status, uint64_t ret);
+token_t	*au_to_seq(long audit_count);
+
 #if defined(_KERNEL) || defined(KERNEL)
-token_t			*au_to_socket(struct socket *so);
-token_t			*au_to_socket_ex_32(uint16_t lp, uint16_t rp,
-				struct sockaddr *la, struct sockaddr *ta);
-token_t			*au_to_socket_ex_128(uint16_t lp, uint16_t rp,
-				struct sockaddr *la, struct sockaddr *ta);
+token_t	*au_to_socket(struct socket *so);
+token_t	*au_to_socket_ex_32(uint16_t lp, uint16_t rp, struct sockaddr *la,
+	    struct sockaddr *ta);
+token_t	*au_to_socket_ex_128(uint16_t lp, uint16_t rp, struct sockaddr *la,
+	    struct sockaddr *ta);
 #endif
-token_t			*au_to_sock_inet(struct sockaddr_in *so);
-token_t			*au_to_sock_inet32(struct sockaddr_in *so);
-token_t			*au_to_sock_inet128(struct sockaddr_in6 *so);
-token_t			*au_to_sock_unix(struct sockaddr_un *so);
-token_t			*au_to_subject(au_id_t auid, uid_t euid, gid_t egid,
-				uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_t *tid);
-token_t			*au_to_subject32(au_id_t auid, uid_t euid, gid_t egid,
-				uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_t *tid);
-token_t			*au_to_subject64(au_id_t auid, uid_t euid, gid_t egid,
-				uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_t *tid);
-token_t			*au_to_subject_ex(au_id_t auid, uid_t euid,
-				gid_t egid, uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_addr_t *tid);
-token_t			*au_to_subject32_ex(au_id_t auid, uid_t euid,
-				gid_t egid, uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_addr_t *tid);
-token_t			*au_to_subject64_ex(au_id_t auid, uid_t euid,
-				gid_t egid, uid_t ruid, gid_t rgid, pid_t pid,
-				au_asid_t sid, au_tid_addr_t *tid);
-token_t			*au_to_exec_args(const char **);
-token_t			*au_to_exec_env(const char **);
-token_t			*au_to_text(char *text);
-token_t			*au_to_kevent(struct kevent *kev);
-token_t			*au_to_trailer(int rec_size);
+
+token_t	*au_to_sock_inet(struct sockaddr_in *so);
+token_t	*au_to_sock_inet32(struct sockaddr_in *so);
+token_t	*au_to_sock_inet128(struct sockaddr_in6 *so);
+token_t	*au_to_sock_unix(struct sockaddr_un *so);
+token_t	*au_to_subject(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
+token_t	*au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
+token_t	*au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
+token_t	*au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
+token_t	*au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
+token_t	*au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
+	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
+token_t	*au_to_exec_args(const char **);
+token_t	*au_to_exec_env(const char **);
+token_t	*au_to_text(char *text);
+token_t	*au_to_kevent(struct kevent *kev);
+token_t	*au_to_trailer(int rec_size);
 
 __END_DECLS
 
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message