From 8e27248698766e3d97e18363c5c4729a4e02add7 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Thu, 6 May 2010 14:55:59 +0100
Subject: [PATCH] Always include afsconfig.h

Our coding standards say that OpenAFS source files should always have
 #include <afsconfig.h>
 #include <afs/param.h>
at the start of the file. Including just param.h, or having these
includes in a different order can produce unexpected effects, because
param.h includes sysnames.h, which in turn includes stds.h, which may
rely upon having the results of configure tests available.

Fix the obvious places in the Unix build which get this wrong.

Change-Id: I081f04dab30a6bbb49fe71d3ac2d7c11e231e2f5
Reviewed-on: http://gerrit.openafs.org/1912
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---
 src/JAVA/libjafs/ACL.c              | 1 +
 src/JAVA/libjafs/FileOutputStream.c | 1 +
 src/JAVA/libjafs/UserToken.c        | 1 +
 src/butc/afsxbsa.c                  | 2 ++
 src/rxkad/fc_test.c                 | 1 +
 src/rxstat/rxstat.c                 | 2 +-
 src/tests/afscp.c                   | 4 +++-
 src/tests/afscp_callback.c          | 2 ++
 src/tests/afsdump_extract.c         | 4 +++-
 src/tests/afsdump_scan.c            | 4 +++-
 src/tests/dumptool.c                | 4 +++-
 src/tests/write-closed2.c           | 4 +++-
 src/util/fstab.c                    | 1 +
 src/vol/namei_map.c                 | 4 +++-
 14 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/JAVA/libjafs/ACL.c b/src/JAVA/libjafs/ACL.c
index e60166e8b..204b74369 100644
--- a/src/JAVA/libjafs/ACL.c
+++ b/src/JAVA/libjafs/ACL.c
@@ -19,6 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
 #include <errno.h>
diff --git a/src/JAVA/libjafs/FileOutputStream.c b/src/JAVA/libjafs/FileOutputStream.c
index e728da1c9..76aceda8e 100644
--- a/src/JAVA/libjafs/FileOutputStream.c
+++ b/src/JAVA/libjafs/FileOutputStream.c
@@ -19,6 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <errno.h>
 
diff --git a/src/JAVA/libjafs/UserToken.c b/src/JAVA/libjafs/UserToken.c
index 1fa5b48d9..051250185 100644
--- a/src/JAVA/libjafs/UserToken.c
+++ b/src/JAVA/libjafs/UserToken.c
@@ -19,6 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
 
 #include "Internal.h"
diff --git a/src/butc/afsxbsa.c b/src/butc/afsxbsa.c
index 1add50844..77920f490 100644
--- a/src/butc/afsxbsa.c
+++ b/src/butc/afsxbsa.c
@@ -9,7 +9,9 @@
 
 #ifdef xbsa
 
+#include <afsconfig.h>
 #include <afs/param.h>
+
 #include <sys/types.h>
 #include <afs/stds.h>
 #include <stdio.h>
diff --git a/src/rxkad/fc_test.c b/src/rxkad/fc_test.c
index 28cc589ee..b80e08078 100644
--- a/src/rxkad/fc_test.c
+++ b/src/rxkad/fc_test.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include "rxkad.h"
 #include <rx/rx.h>
diff --git a/src/rxstat/rxstat.c b/src/rxstat/rxstat.c
index bfb789823..4d3801fb2 100644
--- a/src/rxstat/rxstat.c
+++ b/src/rxstat/rxstat.c
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
 
 #include <afs/stds.h>
diff --git a/src/tests/afscp.c b/src/tests/afscp.c
index 717e705f0..da858d59f 100644
--- a/src/tests/afscp.c
+++ b/src/tests/afscp.c
@@ -1,3 +1,6 @@
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,7 +14,6 @@
 #include <sys/stat.h>
 #include <netdb.h>
 
-#include <afs/param.h>
 #include <afs/afsint.h>
 #define FSINT_COMMON_XG 1
 #include <afs/afscbint.h>
diff --git a/src/tests/afscp_callback.c b/src/tests/afscp_callback.c
index 4a9afa0f9..e590a2657 100644
--- a/src/tests/afscp_callback.c
+++ b/src/tests/afscp_callback.c
@@ -1,4 +1,6 @@
+#include <afsconfig.h>
 #include <afs/param.h>
+
 #include <afs/afscbint.h>	/*Callback interface defs */
 #include <afs/afsutil.h>
 #include <afs/afsutil_prototypes.h>
diff --git a/src/tests/afsdump_extract.c b/src/tests/afsdump_extract.c
index 9558775fc..b1ecbb9d2 100644
--- a/src/tests/afsdump_extract.c
+++ b/src/tests/afsdump_extract.c
@@ -28,6 +28,9 @@
 
 /* afsdump_extract.c - Extract files from an AFS dump */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -35,7 +38,6 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include <afs/param.h>
 #include <afs/com_err.h>
 #include "dumpscan.h"
 #include "dumpscan_errs.h"
diff --git a/src/tests/afsdump_scan.c b/src/tests/afsdump_scan.c
index 0e4221189..98f1a49c8 100644
--- a/src/tests/afsdump_scan.c
+++ b/src/tests/afsdump_scan.c
@@ -28,12 +28,14 @@
 
 /* afsdump_scan.c - General-purpose dump scanner */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/fcntl.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 
-#include <afs/param.h>
 #include <afs/com_err.h>
 #include <afs/pterror.h>
 #include <afs/vlserver.h>
diff --git a/src/tests/dumptool.c b/src/tests/dumptool.c
index decf80bcb..fee670ef3 100644
--- a/src/tests/dumptool.c
+++ b/src/tests/dumptool.c
@@ -61,6 +61,9 @@
  * so directories will appear first in the VNODE section.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -74,7 +77,6 @@
 #include <fcntl.h>
 
 #include <lock.h>
-#include <afs/param.h>
 #include <afs/afsint.h>
 #include <afs/nfs.h>
 #include <afs/acl.h>
diff --git a/src/tests/write-closed2.c b/src/tests/write-closed2.c
index 22e147f7a..a812ff3eb 100644
--- a/src/tests/write-closed2.c
+++ b/src/tests/write-closed2.c
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -53,7 +56,6 @@
 
 #include <err.h>
 #include <netinet/in.h>
-#include <afs/param.h>
 #include <afs/stds.h>
 #include <afs/vice.h>
 #include <afs/venus.h>
diff --git a/src/util/fstab.c b/src/util/fstab.c
index 50d0740cb..cb289e379 100644
--- a/src/util/fstab.c
+++ b/src/util/fstab.c
@@ -27,6 +27,7 @@
  * SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
 
 #if defined(AFS_DARWIN_ENV)
diff --git a/src/vol/namei_map.c b/src/vol/namei_map.c
index 8b24c6f8f..e93b7f468 100644
--- a/src/vol/namei_map.c
+++ b/src/vol/namei_map.c
@@ -1,8 +1,10 @@
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/types.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <afs/param.h>
 #include <afs/afsutil.h>
 
 int main(int argc, char **argv) {
-- 
2.39.5