diff options
Diffstat (limited to 'cpp/src/IceUtil/OutputUtil.cpp')
| -rw-r--r-- | cpp/src/IceUtil/OutputUtil.cpp | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp index acf1a7a4590..e3ef63d1a45 100644 --- a/cpp/src/IceUtil/OutputUtil.cpp +++ b/cpp/src/IceUtil/OutputUtil.cpp @@ -84,14 +84,14 @@ IceUtil::OutputBase::print(const char* s) { for(unsigned int i = 0; i < strlen(s); ++i) { - if(s[i] == '\n') - { - _pos = 0; - } - else - { - ++_pos; - } + if(s[i] == '\n') + { + _pos = 0; + } + else + { + ++_pos; + } } _out << s; @@ -236,10 +236,10 @@ IceUtil::Output::print(const char* s) { if(_par >= 0) { - if(++_par > 1) // No comma for the first parameter. - { - _out << ", "; - } + if(++_par > 1) // No comma for the first parameter. + { + _out << ", "; + } } OutputBase::print(s); } @@ -337,19 +337,19 @@ IceUtil::XMLOutput::print(const char* s) { if(_se) { - _out << '>'; - _se = false; + _out << '>'; + _se = false; } _text = true; if(_escape) { - string escaped = escape(s); - OutputBase::print(escaped.c_str()); + string escaped = escape(s); + OutputBase::print(escaped.c_str()); } else { - OutputBase::print(s); + OutputBase::print(s); } } @@ -358,8 +358,8 @@ IceUtil::XMLOutput::newline() { if(_se) { - _se = false; - _out << '>'; + _se = false; + _out << '>'; } OutputBase::newline(); } @@ -376,11 +376,11 @@ IceUtil::XMLOutput::startElement(const string& element) // if(_escape) { - _out << '<' << escape(element); + _out << '<' << escape(element); } else { - _out << '<' << element; + _out << '<' << element; } _se = true; _text = false; @@ -388,11 +388,11 @@ IceUtil::XMLOutput::startElement(const string& element) string::size_type pos = element.find_first_of(" \t"); if(pos == string::npos) { - _elementStack.push(element); + _elementStack.push(element); } else { - _elementStack.push(element.substr(0, pos)); + _elementStack.push(element.substr(0, pos)); } ++_pos; // TODO: ??? @@ -409,15 +409,15 @@ IceUtil::XMLOutput::endElement() dec(); if(_se) { - _out << "></" << element << '>'; + _out << "></" << element << '>'; } else { - if(!_text) - { - newline(); - } - _out << "</" << element << '>'; + if(!_text) + { + newline(); + } + _out << "</" << element << '>'; } --_pos; // TODO: ??? @@ -472,50 +472,50 @@ IceUtil::XMLOutput::escape(const string& input) const const string allReserved = "<>'\"&"; if(v.find_first_of(allReserved) != string::npos) { - // - // First convert all & to & - // - size_t pos = 0; - while((pos = v.find_first_of('&', pos)) != string::npos) - { - v.insert(pos+1, "amp;"); - pos += 4; - } - - // - // Next convert remaining reserved characters. - // - const string reserved = "<>'\""; - pos = 0; - while((pos = v.find_first_of(reserved, pos)) != string::npos) - { - string replace; - switch(v[pos]) - { - case '>': - replace = ">"; - break; - - case '<': - replace = "<"; - break; - - case '\'': - replace = "'"; - break; - - case '"': - replace = """; - break; - - default: - assert(false); - } - - v.erase(pos, 1); - v.insert(pos, replace); - pos += replace.size(); - } + // + // First convert all & to & + // + size_t pos = 0; + while((pos = v.find_first_of('&', pos)) != string::npos) + { + v.insert(pos+1, "amp;"); + pos += 4; + } + + // + // Next convert remaining reserved characters. + // + const string reserved = "<>'\""; + pos = 0; + while((pos = v.find_first_of(reserved, pos)) != string::npos) + { + string replace; + switch(v[pos]) + { + case '>': + replace = ">"; + break; + + case '<': + replace = "<"; + break; + + case '\'': + replace = "'"; + break; + + case '"': + replace = """; + break; + + default: + assert(false); + } + + v.erase(pos, 1); + v.insert(pos, replace); + pos += replace.size(); + } } return v; } |