12 files changed, 63 insertions, 55 deletions
diff --git a/Modules/CMakeCCompilerABI.c b/Modules/CMakeCCompilerABI.c
index d36219e732..55f9a9b516 100644
--- a/Modules/CMakeCCompilerABI.c
+++ b/Modules/CMakeCCompilerABI.c
@@ -1,19 +1,18 @@
 #ifdef __cplusplus
-# error "A C++ compiler has been selected for C."
+#error "A C++ compiler has been selected for C."
 #endif
 
 #ifdef __CLASSIC_C__
-# define const
+#define const
 #endif
 
-
 #include "CMakeCompilerABI.h"
 
-
 #ifdef __CLASSIC_C__
-int main(argc, argv) int argc; char *argv[];
+int main(argc, argv) int argc;
+char* argv[];
 #else
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 #endif
 {
   int require = 0;
diff --git a/Modules/CMakeCXXCompilerABI.cpp b/Modules/CMakeCXXCompilerABI.cpp
index c7ce1947ee..2dee883fd8 100644
--- a/Modules/CMakeCXXCompilerABI.cpp
+++ b/Modules/CMakeCXXCompilerABI.cpp
@@ -1,11 +1,9 @@
 #ifndef __cplusplus
-# error "A C compiler has been selected for C++."
+#error "A C compiler has been selected for C++."
 #endif
 
-
 #include "CMakeCompilerABI.h"
 
-
 int main(int argc, char* argv[])
 {
   int require = 0;
diff --git a/Modules/CMakeCompilerABI.h b/Modules/CMakeCompilerABI.h
index 95bd791c87..f2714b4eab 100644
--- a/Modules/CMakeCompilerABI.h
+++ b/Modules/CMakeCompilerABI.h
@@ -1,34 +1,32 @@
 
 /* Size of a pointer-to-data in bytes.  */
 #define SIZEOF_DPTR (sizeof(void*))
-const char info_sizeof_dptr[] =  {
-  'I', 'N', 'F', 'O', ':', 's', 'i', 'z', 'e', 'o', 'f', '_', 'd', 'p', 't', 'r', '[',
-  ('0' + ((SIZEOF_DPTR / 10)%10)),
-  ('0' +  (SIZEOF_DPTR    % 10)),
-  ']','\0'
+const char info_sizeof_dptr[] = {
+  'I', 'N', 'F', 'O', ':', 's', 'i', 'z', 'e', 'o', 'f', '_', 'd', 'p', 't',
+  'r', '[', ('0' + ((SIZEOF_DPTR / 10) % 10)), ('0' + (SIZEOF_DPTR % 10)), ']',
+  '\0'
   /* clang-format needs this comment to break after the opening brace */
 };
 
-
 /* Application Binary Interface.  */
 #if defined(__sgi) && defined(_ABIO32)
-# define ABI_ID "ELF O32"
+#define ABI_ID "ELF O32"
 #elif defined(__sgi) && defined(_ABIN32)
-# define ABI_ID "ELF N32"
+#define ABI_ID "ELF N32"
 #elif defined(__sgi) && defined(_ABI64)
-# define ABI_ID "ELF 64"
+#define ABI_ID "ELF 64"
 
 /* Check for (some) ARM ABIs.
  * See e.g. http://wiki.debian.org/ArmEabiPort for some information on this. */
 #elif defined(__GNU__) && defined(__ELF__) && defined(__ARM_EABI__)
-# define ABI_ID "ELF ARMEABI"
+#define ABI_ID "ELF ARMEABI"
 #elif defined(__GNU__) && defined(__ELF__) && defined(__ARMEB__)
-# define ABI_ID "ELF ARM"
+#define ABI_ID "ELF ARM"
 #elif defined(__GNU__) && defined(__ELF__) && defined(__ARMEL__)
-# define ABI_ID "ELF ARM"
+#define ABI_ID "ELF ARM"
 
 #elif defined(__ELF__)
-# define ABI_ID "ELF"
+#define ABI_ID "ELF"
 #endif
 
 #if defined(ABI_ID)
diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c
index 9629a66f03..6fc6f26341 100644
--- a/Modules/CheckForPthreads.c
+++ b/Modules/CheckForPthreads.c
@@ -6,11 +6,13 @@ void* runner(void*);
 
 int res = 0;
 #ifdef __CLASSIC_C__
-int main(){
+int main()
+{
   int ac;
-  char*av[];
+  char* av[];
 #else
-int main(int ac, char*av[]){
+int main(int ac, char* av[])
+{
 #endif
   pthread_t tid[2];
   pthread_create(&tid[0], 0, runner, (void*)1);
@@ -22,17 +24,18 @@ int main(int ac, char*av[]){
 
   pthread_join(tid[0], 0);
   pthread_join(tid[1], 0);
-  if(ac > 1000){return *av[0];}
+  if (ac > 1000) {
+    return *av[0];
+  }
   return res;
 }
 
 void* runner(void* args)
 {
   int cc;
-  for ( cc = 0; cc < 10; cc ++ )
-    {
+  for (cc = 0; cc < 10; cc++) {
     printf("%p CC: %d\n", args, cc);
-    }
-  res ++;
+  }
+  res++;
   return 0;
 }
diff --git a/Modules/CheckFunctionExists.c b/Modules/CheckFunctionExists.c
index fd29618ce8..23040003fb 100644
--- a/Modules/CheckFunctionExists.c
+++ b/Modules/CheckFunctionExists.c
@@ -3,24 +3,26 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char CHECK_FUNCTION_EXISTS();
+  char
+  CHECK_FUNCTION_EXISTS();
 #ifdef __CLASSIC_C__
-int main(){
+int main()
+{
   int ac;
-  char*av[];
+  char* av[];
 #else
-int main(int ac, char*av[]){
+int main(int ac, char* av[])
+{
 #endif
   CHECK_FUNCTION_EXISTS();
-  if(ac > 1000)
-    {
+  if (ac > 1000) {
     return *av[0];
-    }
+  }
   return 0;
 }
 
-#else  /* CHECK_FUNCTION_EXISTS */
+#else /* CHECK_FUNCTION_EXISTS */
 
-#  error "CHECK_FUNCTION_EXISTS has to specify the function"
+#error "CHECK_FUNCTION_EXISTS has to specify the function"
 
 #endif /* CHECK_FUNCTION_EXISTS */
diff --git a/Modules/CheckVariableExists.c b/Modules/CheckVariableExists.c
index 752f6e486b..6e948771b1 100644
--- a/Modules/CheckVariableExists.c
+++ b/Modules/CheckVariableExists.c
@@ -3,18 +3,22 @@
 extern int CHECK_VARIABLE_EXISTS;
 
 #ifdef __CLASSIC_C__
-int main(){
+int main()
+{
   int ac;
-  char*av[];
+  char* av[];
 #else
-int main(int ac, char*av[]){
+int main(int ac, char* av[])
+{
 #endif
-  if(ac > 1000){return *av[0];}
+  if (ac > 1000) {
+    return *av[0];
+  }
   return CHECK_VARIABLE_EXISTS;
 }
 
-#else  /* CHECK_VARIABLE_EXISTS */
+#else /* CHECK_VARIABLE_EXISTS */
 
-#  error "CHECK_VARIABLE_EXISTS has to specify the variable"
+#error "CHECK_VARIABLE_EXISTS has to specify the variable"
 
 #endif /* CHECK_VARIABLE_EXISTS */
diff --git a/Modules/FortranCInterface/my_module_.c b/Modules/FortranCInterface/my_module_.c
index 6510ae9774..6fa89d1df3 100644
--- a/Modules/FortranCInterface/my_module_.c
+++ b/Modules/FortranCInterface/my_module_.c
@@ -1 +1,3 @@
-void my_module_(void) {}
+void my_module_(void)
+{
+}
diff --git a/Modules/FortranCInterface/mymodule_.c b/Modules/FortranCInterface/mymodule_.c
index 52706058e4..444953b891 100644
--- a/Modules/FortranCInterface/mymodule_.c
+++ b/Modules/FortranCInterface/mymodule_.c
@@ -1 +1,3 @@
-void mymodule_(void) {}
+void mymodule_(void)
+{
+}
diff --git a/Modules/TestForANSIStreamHeaders.cxx b/Modules/TestForANSIStreamHeaders.cxx
index cfb768608f..d314d585c3 100644
--- a/Modules/TestForANSIStreamHeaders.cxx
+++ b/Modules/TestForANSIStreamHeaders.cxx
@@ -1,6 +1,6 @@
 #include <iostream>
 
-int main(int,char *[])
+int main(int, char* [])
 {
   return 0;
 }
diff --git a/Modules/TestForAnsiForScope.cxx b/Modules/TestForAnsiForScope.cxx
index e8807ab4aa..4bc2c67921 100644
--- a/Modules/TestForAnsiForScope.cxx
+++ b/Modules/TestForAnsiForScope.cxx
@@ -1,7 +1,8 @@
-int main(int, char*[])
+int main(int, char* [])
 {
   int i;
-  for(int i=0; i < 1; ++i);
+  for (int i = 0; i < 1; ++i)
+    ;
   (void)i;
   return 0;
 }
diff --git a/Modules/TestForSSTREAM.cxx b/Modules/TestForSSTREAM.cxx
index 1c939da239..83a75e4781 100644
--- a/Modules/TestForSSTREAM.cxx
+++ b/Modules/TestForSSTREAM.cxx
@@ -1,11 +1,10 @@
 #include <sstream>
-int main(int, char*[])
+int main(int, char* [])
 {
   std::ostringstream os;
   os << "12345";
-  if(os.str().size() == 5)
-    {
+  if (os.str().size() == 5) {
     return 0;
-    }
+  }
   return -1;
 }
diff --git a/Modules/TestForSTDNamespace.cxx b/Modules/TestForSTDNamespace.cxx
index b537d44a93..62951ff269 100644
--- a/Modules/TestForSTDNamespace.cxx
+++ b/Modules/TestForSTDNamespace.cxx
@@ -1,5 +1,5 @@
 #include <list>
-int main(int, char*[])
+int main(int, char* [])
 {
   std::list<int>();
   return 0;