KWSys 2016-11-09 (18c65411)

Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 18c654114de3aa65429542f95308720bc68f9231 (master).

Upstream Shortlog
-----------------

Brad King (14):
      37306a1c FStream: Quiet unused argument warning
      15e90a3c Sort includes to stabilize include order w.r.t. clang-format
      26509227 Copyright.txt: Add notice of copyright by contributors
      fc42d3f2 Add temporary script to filter license notices
      c41c1bc4 Simplify KWSys per-source license notices
      1d4c0b4a Remove temporary script that filtered license notices
      a4f5ef79 SystemInformation: Remove stray comment
      8649a886 kwsysPrivate: Protect KWSYS_HEADER macro from clang-format
      89b98af5 Configure clang-format for KWSys source tree
      547dacad Add a script to run clang-format on the entire source tree
      aa94be0c CONTRIBUTING: Add a section on coding style
      6604c4b6 Empty commit at end of history preceding clang-format style transition
      2b3e2b1c Tell Git to not export 'clang-format' infrastructure
      18c65411 FStream: Include Configure.hxx before other headers

Kitware Robot (1):
      6c973b46 Revise C++ coding style using clang-format

1 files changed, 34 insertions, 49 deletions

diff --git a/testCommandLineArguments1.cxx b/testCommandLineArguments1.cxx
index 6eb465d..5a03401 100644
--- a/testCommandLineArguments1.cxx
+++ b/testCommandLineArguments1.cxx
@@ -1,21 +1,12 @@
-/*============================================================================
-  KWSys - Kitware System Library
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+   file Copyright.txt or https://cmake.org/licensing#kwsys for details.  */
 #include "kwsysPrivate.h"
 #include KWSYS_HEADER(CommandLineArguments.hxx)
 
 // Work-around CMake dependency scanning limitation.  This must
 // duplicate the above list of headers.
 #if 0
-# include "CommandLineArguments.hxx.in"
+#include "CommandLineArguments.hxx.in"
 #endif
 
 #include <iostream>
@@ -41,68 +32,62 @@ int testCommandLineArguments1(int argc, char* argv[])
 
   arg.StoreUnusedArguments(true);
 
-  if ( !arg.Parse() )
-    {
+  if (!arg.Parse()) {
     std::cerr << "Problem parsing arguments" << std::endl;
     res = 1;
-    }
-  if ( n != 24 )
-    {
+  }
+  if (n != 24) {
     std::cout << "Problem setting N. Value of N: " << n << std::endl;
     res = 1;
-    }
-  if ( !m || strcmp(m, "test value") != 0 )
-    {
+  }
+  if (!m || strcmp(m, "test value") != 0) {
     std::cout << "Problem setting M. Value of M: " << m << std::endl;
     res = 1;
-    }
-  if ( p != "1" )
-    {
+  }
+  if (p != "1") {
     std::cout << "Problem setting P. Value of P: " << p << std::endl;
     res = 1;
-    }
+  }
   std::cout << "Value of N: " << n << std::endl;
   std::cout << "Value of M: " << m << std::endl;
   std::cout << "Value of P: " << p << std::endl;
-  if ( m )
-    {
-    delete [] m;
-    }
+  if (m) {
+    delete[] m;
+  }
 
   char** newArgv = 0;
   int newArgc = 0;
   arg.GetUnusedArguments(&newArgc, &newArgv);
   int cc;
-  const char* valid_unused_args[9] = {
-    0, "--ignored", "--second-ignored", "third-ignored",
-    "some", "junk", "at", "the", "end"
-  };
-  if ( newArgc != 9 )
-    {
+  const char* valid_unused_args[9] = { 0,
+                                       "--ignored",
+                                       "--second-ignored",
+                                       "third-ignored",
+                                       "some",
+                                       "junk",
+                                       "at",
+                                       "the",
+                                       "end" };
+  if (newArgc != 9) {
     std::cerr << "Bad number of unused arguments: " << newArgc << std::endl;
     res = 1;
-    }
-  for ( cc = 0; cc < newArgc; ++ cc )
-    {
+  }
+  for (cc = 0; cc < newArgc; ++cc) {
     assert(newArgv[cc]); /* Quiet Clang scan-build. */
     std::cout << "Unused argument[" << cc << "] = [" << newArgv[cc] << "]"
-      << std::endl;
-    if ( cc >= 9 )
-      {
+              << std::endl;
+    if (cc >= 9) {
       std::cerr << "Too many unused arguments: " << cc << std::endl;
       res = 1;
-      }
-    else if ( valid_unused_args[cc] &&
-      strcmp(valid_unused_args[cc], newArgv[cc]) != 0 )
-      {
-      std::cerr << "Bad unused argument [" << cc << "] \""
-        << newArgv[cc] << "\" should be: \"" << valid_unused_args[cc] << "\""
-        << std::endl;
+    } else if (valid_unused_args[cc] &&
+               strcmp(valid_unused_args[cc], newArgv[cc]) != 0) {
+      std::cerr << "Bad unused argument [" << cc << "] \"" << newArgv[cc]
+                << "\" should be: \"" << valid_unused_args[cc] << "\""
+                << std::endl;
       res = 1;
-      }
     }
+  }
   arg.DeleteRemainingArguments(newArgc, &newArgv);
 
   return res;
 }
-