Merge topic 'clang-format-source'

d9fd2f54 Revise C++ coding style using clang-format
82df6dea Empty commit at end of history preceding clang-format style transition
6a13f43f CONTRIBUTING: Add a section on coding style
bf451d9f Add a script to run clang-format on the entire source tree
1e90d78f Configure clang-format for CMake source tree
da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files

1 files changed, 6 insertions, 10 deletions

diff --git a/Tests/CTestTestResourceLock/lockFile.c b/Tests/CTestTestResourceLock/lockFile.c
index a6a4dc0..8c023ef 100644
--- a/Tests/CTestTestResourceLock/lockFile.c
+++ b/Tests/CTestTestResourceLock/lockFile.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 /* Disable deprecation warning for fopen */
-#pragma warning(disable: 4996)
+#pragma warning(disable : 4996)
 
 /*if run serially, works fine.
   If run in parallel, someone will attempt to delete
@@ -11,21 +11,17 @@ int main(int argc, char** argv)
   FILE* file;
   int i;
   const char* fname;
-  if(argc >= 2)
-    {
+  if (argc >= 2) {
     fname = argv[1];
-    }
-  else
-    {
+  } else {
     fname = "lockedFile.txt";
-    }
+  }
   file = fopen(fname, "w");
 
-  for(i = 0; i < 10000; i++)
-    {
+  for (i = 0; i < 10000; i++) {
     fprintf(file, "%s", "x");
     fflush(file);
-    }
+  }
   fclose(file);
   return remove(fname);
 }