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>

diff --git a/src/JAVA/libjafs/ACL.c b/src/JAVA/libjafs/ACL.c
index e60166e..204b743 100644 (file)
--- 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 e728da1..76aceda 100644 (file)
--- 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 1fa5b48..0512501 100644 (file)
--- 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 1add508..77920f4 100644 (file)
--- 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 28cc589..b80e080 100644 (file)
--- 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 bfb7898..4d3801f 100644 (file)
--- 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 717e705..da858d5 100644 (file)
--- 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 4a9afa0..e590a26 100644 (file)
--- 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 9558775..b1ecbb9 100644 (file)
--- 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 0e42211..98f1a49 100644 (file)
--- 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 decf80b..fee670e 100644 (file)
--- 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 22e147f..a812ff3 100644 (file)
--- 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 50d0740..cb289e3 100644 (file)
--- 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 8b24c6f..e93b7f4 100644 (file)
--- 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) {