summaryrefslogtreecommitdiff
path: root/Source/cmXMLSafe.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 10:34:04 -0400
committerBrad King <brad.king@kitware.com>2016-05-16 16:05:19 -0400
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmXMLSafe.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadcmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/cmXMLSafe.cxx')
-rw-r--r--Source/cmXMLSafe.cxx72
1 files changed, 38 insertions, 34 deletions
diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx
index 0a76e9d94b..f899f577cb 100644
--- a/Source/cmXMLSafe.cxx
+++ b/Source/cmXMLSafe.cxx
@@ -19,17 +19,17 @@
#include <stdio.h>
#include <string.h>
-cmXMLSafe::cmXMLSafe(const char* s):
- Data(s),
- Size(static_cast<unsigned long>(strlen(s))),
- DoQuotes(true)
+cmXMLSafe::cmXMLSafe(const char* s)
+ : Data(s)
+ , Size(static_cast<unsigned long>(strlen(s)))
+ , DoQuotes(true)
{
}
-cmXMLSafe::cmXMLSafe(std::string const& s):
- Data(s.c_str()),
- Size(static_cast<unsigned long>(s.length())),
- DoQuotes(true)
+cmXMLSafe::cmXMLSafe(std::string const& s)
+ : Data(s.c_str())
+ , Size(static_cast<unsigned long>(s.length()))
+ , DoQuotes(true)
{
}
@@ -50,48 +50,52 @@ std::ostream& operator<<(std::ostream& os, cmXMLSafe const& self)
{
char const* first = self.Data;
char const* last = self.Data + self.Size;
- while(first != last)
- {
+ while (first != last) {
unsigned int ch;
- if(const char* next = cm_utf8_decode_character(first, last, &ch))
- {
+ if (const char* next = cm_utf8_decode_character(first, last, &ch)) {
// http://www.w3.org/TR/REC-xml/#NT-Char
- if((ch >= 0x20 && ch <= 0xD7FF) ||
- (ch >= 0xE000 && ch <= 0xFFFD) ||
- (ch >= 0x10000 && ch <= 0x10FFFF) ||
- ch == 0x9 || ch == 0xA || ch == 0xD)
- {
- switch(ch)
- {
+ if ((ch >= 0x20 && ch <= 0xD7FF) || (ch >= 0xE000 && ch <= 0xFFFD) ||
+ (ch >= 0x10000 && ch <= 0x10FFFF) || ch == 0x9 || ch == 0xA ||
+ ch == 0xD) {
+ switch (ch) {
// Escape XML control characters.
- case '&': os << "&amp;"; break;
- case '<': os << "&lt;"; break;
- case '>': os << "&gt;"; break;
- case '"': os << (self.DoQuotes? "&quot;" : "\""); break;
- case '\'': os << (self.DoQuotes? "&apos;" : "'"); break;
- case '\r': break; // Ignore CR
+ case '&':
+ os << "&amp;";
+ break;
+ case '<':
+ os << "&lt;";
+ break;
+ case '>':
+ os << "&gt;";
+ break;
+ case '"':
+ os << (self.DoQuotes ? "&quot;" : "\"");
+ break;
+ case '\'':
+ os << (self.DoQuotes ? "&apos;" : "'");
+ break;
+ case '\r':
+ break; // Ignore CR
// Print the UTF-8 character.
- default: os.write(first, next-first); break;
- }
+ default:
+ os.write(first, next - first);
+ break;
}
- else
- {
+ } else {
// Use a human-readable hex value for this invalid character.
char buf[16];
sprintf(buf, "%X", ch);
os << "[NON-XML-CHAR-0x" << buf << "]";
- }
+ }
first = next;
- }
- else
- {
+ } else {
ch = static_cast<unsigned char>(*first++);
// Use a human-readable hex value for this invalid byte.
char buf[16];
sprintf(buf, "%X", ch);
os << "[NON-UTF-8-BYTE-0x" << buf << "]";
- }
}
+ }
return os;
}