Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2016-11-09 (18c65411)

1 files changed, 20 insertions, 33 deletions

diff --git a/Source/kwsys/EncodingC.c b/Source/kwsys/EncodingC.c
index 32b9bff..c1315b2 100644
--- a/Source/kwsys/EncodingC.c
+++ b/Source/kwsys/EncodingC.c
@@ -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(Encoding.h)
 
 /* Work-around CMake dependency scanning limitation.  This must
    duplicate the above list of headers.  */
 #if 0
-# include "Encoding.h.in"
+#include "Encoding.h.in"
 #endif
 
 #include <stdlib.h>
@@ -26,13 +17,13 @@
 
 size_t kwsysEncoding_mbstowcs(wchar_t* dest, const char* str, size_t n)
 {
-  if(str == 0)
-    {
+  if (str == 0) {
     return (size_t)-1;
-    }
+  }
 #ifdef _WIN32
-  return MultiByteToWideChar(KWSYS_ENCODING_DEFAULT_CODEPAGE, 0,
-                             str, -1, dest, (int)n) - 1;
+  return MultiByteToWideChar(KWSYS_ENCODING_DEFAULT_CODEPAGE, 0, str, -1, dest,
+                             (int)n) -
+    1;
 #else
   return mbstowcs(dest, str, n);
 #endif
@@ -42,27 +33,25 @@ wchar_t* kwsysEncoding_DupToWide(const char* str)
 {
   wchar_t* ret = NULL;
   size_t length = kwsysEncoding_mbstowcs(NULL, str, 0) + 1;
-  if(length > 0)
-    {
-    ret = (wchar_t*)malloc((length)*sizeof(wchar_t));
-    if(ret)
-      {
+  if (length > 0) {
+    ret = (wchar_t*)malloc((length) * sizeof(wchar_t));
+    if (ret) {
       ret[0] = 0;
       kwsysEncoding_mbstowcs(ret, str, length);
-      }
     }
+  }
   return ret;
 }
 
 size_t kwsysEncoding_wcstombs(char* dest, const wchar_t* str, size_t n)
 {
-  if(str == 0)
-    {
+  if (str == 0) {
     return (size_t)-1;
-    }
+  }
 #ifdef _WIN32
-  return WideCharToMultiByte(KWSYS_ENCODING_DEFAULT_CODEPAGE, 0, str, -1,
-                             dest, (int)n, NULL, NULL) - 1;
+  return WideCharToMultiByte(KWSYS_ENCODING_DEFAULT_CODEPAGE, 0, str, -1, dest,
+                             (int)n, NULL, NULL) -
+    1;
 #else
   return wcstombs(dest, str, n);
 #endif
@@ -72,14 +61,12 @@ char* kwsysEncoding_DupToNarrow(const wchar_t* str)
 {
   char* ret = NULL;
   size_t length = kwsysEncoding_wcstombs(0, str, 0) + 1;
-  if(length > 0)
-    {
+  if (length > 0) {
     ret = (char*)malloc(length);
-    if(ret)
-      {
+    if (ret) {
       ret[0] = 0;
       kwsysEncoding_wcstombs(ret, str, length);
-      }
     }
+  }
   return ret;
 }