Imported Upstream version 3.9.4upstream/3.9.4

1 files changed, 20 insertions, 47 deletions

diff --git a/Source/cmNewLineStyle.cxx b/Source/cmNewLineStyle.cxx
index 6f7b6a949..5500eba65 100644
--- a/Source/cmNewLineStyle.cxx
+++ b/Source/cmNewLineStyle.cxx
@@ -1,94 +1,67 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2011 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 for details.  */
 #include "cmNewLineStyle.h"
 
+#include <stddef.h>
 
-
-cmNewLineStyle::cmNewLineStyle() : NewLineStyle(Invalid)
+cmNewLineStyle::cmNewLineStyle()
+  : NewLineStyle(Invalid)
 {
 }
 
-
 bool cmNewLineStyle::IsValid() const
 {
   return NewLineStyle != Invalid;
 }
 
-
 bool cmNewLineStyle::ReadFromArguments(const std::vector<std::string>& args,
                                        std::string& errorString)
 {
   NewLineStyle = Invalid;
 
-  for (size_t i = 0; i< args.size(); i++)
-    {
-    if (args[i] == "NEWLINE_STYLE")
-      {
+  for (size_t i = 0; i < args.size(); i++) {
+    if (args[i] == "NEWLINE_STYLE") {
       size_t const styleIndex = i + 1;
-      if (args.size() > styleIndex)
-        {
-        const std::string eol = args[styleIndex];
-        if (eol == "LF" || eol == "UNIX")
-          {
+      if (args.size() > styleIndex) {
+        std::string const& eol = args[styleIndex];
+        if (eol == "LF" || eol == "UNIX") {
           NewLineStyle = LF;
           return true;
-          }
-        else if (eol == "CRLF" || eol == "WIN32" || eol == "DOS")
-          {
+        }
+        if (eol == "CRLF" || eol == "WIN32" || eol == "DOS") {
           NewLineStyle = CRLF;
           return true;
-          }
-        else
-          {
-          errorString = "NEWLINE_STYLE sets an unknown style, only LF, "
-                        "CRLF, UNIX, DOS, and WIN32 are supported";
-          return false;
-          }
         }
-      else
-        {
-        errorString = "NEWLINE_STYLE must set a style: "
-                      "LF, CRLF, UNIX, DOS, or WIN32";
+        errorString = "NEWLINE_STYLE sets an unknown style, only LF, "
+                      "CRLF, UNIX, DOS, and WIN32 are supported";
         return false;
-        }
       }
+      errorString = "NEWLINE_STYLE must set a style: "
+                    "LF, CRLF, UNIX, DOS, or WIN32";
+      return false;
     }
+  }
   return true;
 }
 
-
 const std::string cmNewLineStyle::GetCharacters() const
 {
-  switch (NewLineStyle)
-    {
+  switch (NewLineStyle) {
     case Invalid:
       return "";
     case LF:
       return "\n";
     case CRLF:
       return "\r\n";
-    default:
-      ;
-    };
+  }
   return "";
 }
 
-
 void cmNewLineStyle::SetStyle(Style style)
 {
   NewLineStyle = style;
 }
 
-
 cmNewLineStyle::Style cmNewLineStyle::GetStyle() const
 {
   return NewLineStyle;