From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 19:27:21 +0000 (+0000)
Subject: audit: Tidy header includes
X-Git-Tag: upstream/1.8.0_pre1^2~3972
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1aab133e495a27fa4783379478c563d0ec066a9c;p=packages%2Fo%2Fopenafs.git

audit: Tidy header includes

Since we adopted libroken, we get a lot of header includes automatically
from roken.h. Use these, instead of including lots of things multiple
times.

Change-Id: I5543c5c9c22828ee19460c2ab24065f508a6353f
Reviewed-on: http://gerrit.openafs.org/4320
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/audit/audit-file.c b/src/audit/audit-file.c
index b786c8dec..3c3c8d2fb 100644
--- a/src/audit/audit-file.c
+++ b/src/audit/audit-file.c
@@ -9,20 +9,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+
+#include <roken.h>
+
 #include <afs/afsutil.h>
 
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifndef AFS_NT40_ENV
-#include <sys/param.h>
-#include <unistd.h>
-#else
-#include <io.h>
-#endif
 #include "audit-api.h"
 
 static FILE *auditout;
diff --git a/src/audit/audit-sysvmq.c b/src/audit/audit-sysvmq.c
index 01e942cb0..6004c16b0 100644
--- a/src/audit/audit-sysvmq.c
+++ b/src/audit/audit-sysvmq.c
@@ -16,16 +16,8 @@
  * have sys/ipc.h */
 #ifdef HAVE_SYS_IPC_H
 
-
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 #include "audit-api.h"
 
diff --git a/src/audit/audit.c b/src/audit/audit.c
index 7e0a2ab7b..5f7490679 100644
--- a/src/audit/audit.c
+++ b/src/audit/audit.c
@@ -12,14 +12,6 @@
 
 #include <roken.h>
 
-#include <fcntl.h>
-#include <stdarg.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
 #ifdef AFS_AIX32_ENV
 #include <sys/audit.h>
 #else
@@ -29,7 +21,6 @@
 #define AUDIT_FAIL_ACCESS 3
 #define AUDIT_FAIL_PRIV 4
 #endif /* AFS_AIX32_ENV */
-#include <errno.h>
 
 #include "afs/afsint.h"
 #include <rx/rx.h>
@@ -37,9 +28,7 @@
 #include "audit.h"
 #include "audit-api.h"
 #include "lock.h"
-#ifdef AFS_AIX32_ENV
-#include <sys/audit.h>
-#endif
+
 #include <afs/afsutil.h>
 
 /* C99 requires va_copy.  Older versions of GCC provide __va_copy.  Per t