reconcile korg/master into goog/master

[android/aapt.git] / XMLNode.cpp

diff --git a/XMLNode.cpp b/XMLNode.cpp
index 2a85bc7e8b6d55be36a6512a7f5e1de7620bff23..6daa0d206da62065111102bf20c68b21d4fb6b17 100644 (file)
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@ -220,7 +220,7 @@ moveon:
             spanStack.pop();
 
             if (empty) {
-                fprintf(stderr, "%s:%d: WARNING: empty '%s' span found in text '%s'\n",
+                fprintf(stderr, "%s:%d: warning: empty '%s' span found in text '%s'\n",
                         fileName, inXml->getLineNumber(),
                         String8(spanTag).string(), String8(*outString).string());
 
@@ -486,6 +486,7 @@ XMLNode::XMLNode(const String8& filename, const String16& s1, const String16& s2
 XMLNode::XMLNode(const String8& filename)
     : mFilename(filename)
 {
+    memset(&mCharsValue, 0, sizeof(mCharsValue));
 }
 
 XMLNode::type XMLNode::getType() const