summaryrefslogtreecommitdiffstats
path: root/FStream.cxx
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2016-11-09 14:12:29 (GMT)
committerBrad King <brad.king@kitware.com>2016-11-09 14:22:56 (GMT)
commit773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d (patch)
treebd409d3f09f6714981a444e896e1bc08e22ee184 /FStream.cxx
parent53862f04a0002894c0ef5aeb23d52495e5abe60d (diff)
downloadCMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.zip
CMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.tar.gz
CMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.tar.bz2
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
Diffstat (limited to 'FStream.cxx')
-rw-r--r--FStream.cxx67
1 files changed, 22 insertions, 45 deletions
diff --git a/FStream.cxx b/FStream.cxx
index 5a30997..3c44a6f 100644
--- a/FStream.cxx
+++ b/FStream.cxx
@@ -1,78 +1,55 @@
-/*============================================================================
- 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(FStream.hxx)
// Work-around CMake dependency scanning limitation. This must
// duplicate the above list of headers.
#if 0
-# include "FStream.hxx.in"
+#include "FStream.hxx.in"
#endif
-namespace KWSYS_NAMESPACE
-{
-namespace FStream
-{
+namespace KWSYS_NAMESPACE {
+namespace FStream {
BOM ReadBOM(std::istream& in)
{
- if(!in.good())
- {
+ if (!in.good()) {
return BOM_None;
- }
+ }
unsigned long orig = in.tellg();
unsigned char bom[4];
in.read(reinterpret_cast<char*>(bom), 2);
- if(!in.good())
- {
+ if (!in.good()) {
in.clear();
in.seekg(orig);
return BOM_None;
- }
- if(bom[0] == 0xEF && bom[1] == 0xBB)
- {
- in.read(reinterpret_cast<char*>(bom+2), 1);
- if(in.good() && bom[2] == 0xBF)
- {
+ }
+ if (bom[0] == 0xEF && bom[1] == 0xBB) {
+ in.read(reinterpret_cast<char*>(bom + 2), 1);
+ if (in.good() && bom[2] == 0xBF) {
return BOM_UTF8;
- }
}
- else if(bom[0] == 0xFE && bom[1] == 0xFF)
- {
+ } else if (bom[0] == 0xFE && bom[1] == 0xFF) {
return BOM_UTF16BE;
- }
- else if(bom[0] == 0x00 && bom[1] == 0x00)
- {
- in.read(reinterpret_cast<char*>(bom+2), 2);
- if(in.good() && bom[2] == 0xFE && bom[3] == 0xFF)
- {
+ } else if (bom[0] == 0x00 && bom[1] == 0x00) {
+ in.read(reinterpret_cast<char*>(bom + 2), 2);
+ if (in.good() && bom[2] == 0xFE && bom[3] == 0xFF) {
return BOM_UTF32BE;
- }
}
- else if(bom[0] == 0xFF && bom[1] == 0xFE)
- {
+ } else if (bom[0] == 0xFF && bom[1] == 0xFE) {
unsigned long p = in.tellg();
- in.read(reinterpret_cast<char*>(bom+2), 2);
- if(in.good() && bom[2] == 0x00 && bom[3] == 0x00)
- {
+ in.read(reinterpret_cast<char*>(bom + 2), 2);
+ if (in.good() && bom[2] == 0x00 && bom[3] == 0x00) {
return BOM_UTF32LE;
- }
+ }
in.seekg(p);
return BOM_UTF16LE;
- }
+ }
in.clear();
in.seekg(orig);
return BOM_None;
}
} // FStream namespace
-} //KWSYS_NAMESPACE
+} // KWSYS_NAMESPACE