[dgorbachev] 42192: Silence GCC warnings.

Author: dgorbachev
Date: Sat Jul 25 09:41:42 2009
New Revision: 42192

URL: http://svn.reactos.org/svn/reactos?rev=42192&view=rev
Log:
Silence GCC warnings.

Modified:
    trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp

Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utility...
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] Sat Jul 25 09:41:42 2009
@@ -305,13 +305,14 @@
    int n = 0;

for(XMLNode::Children::const_iterator it=_children.begin(); it!=_children.end(); ++it)
-		if (elem.matches(**it, n))
+		if (elem.matches(**it, n)) {
    		if (from != to)
    			 // iterate deeper
    			cnt += (*it)->count(from, to);
    		else
    			 // increment match counter
    			++cnt;
+		}

return cnt;
 }
@@ -863,7 +864,7 @@
    	if (!isspace((unsigned char)p[-1]))
    		break;

-	if (p != s)
+	if (p != s) {
    	if (_pos->_children.empty()) {	// no children in last node?
    		if (_last_tag == TAG_START)
    			_pos->_content.append(s, p-s);
@@ -873,6 +874,7 @@
    			p = s;
    	} else
    		_pos->_children.back()->_trailing.append(s, p-s);
+	}

std::string leading;

@@ -914,13 +916,14 @@
    	_pos->_cdata_content = false;
    }

-	if (p != s)
+	if (p != s) {
    	if (_pos->_children.empty())	// no children in current node?
    		_pos->_content.append(s, p-s);
    	else if (_last_tag == TAG_START)
    		_pos->_content.append(s, p-s);
    	else
    		_pos->_children.back()->_trailing.append(s, p-s);
+	}

if (p != e)
    	_pos->_end_leading.assign(p, e-p);
@@ -989,9 +992,10 @@
    if (_format._pretty >= PRETTY_LINEFEED)
    	_out << _format._endl;

-	if (_format._pretty == PRETTY_INDENT)
+	if (_format._pretty == PRETTY_INDENT) {
    	for(size_t i=_stack.size(); --i>0; )
    		_out << XML_INDENT_SPACE;
+	}

_out << '<' << EncodeXMLString(entry._node_name);
    //entry._state = PRE;
@@ -1020,9 +1024,10 @@
    	if (_format._pretty>=PRETTY_LINEFEED && entry._content.empty())
    		_out << _format._endl;

-		if (_format._pretty==PRETTY_INDENT && entry._content.empty())
+		if (_format._pretty==PRETTY_INDENT && entry._content.empty()) {
    		for(size_t i=_stack.size(); --i>0; )
    			_out << XML_INDENT_SPACE;
+		}

_out << "</" << EncodeXMLString(entry._node_name) << ">";
    } else {