Add --auto-add-overlay option to aapt. DO NOT MERGE

[android/aapt.git] / XMLNode.cpp

diff --git a/XMLNode.cpp b/XMLNode.cpp
index 2a85bc7e8b6d55be36a6512a7f5e1de7620bff23..d4d2a45c2d0f592e1c4ee741575d8dd67a2b673d 100644 (file)
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@ -219,8 +219,13 @@ moveon:
             }
             spanStack.pop();
 
             }
             spanStack.pop();
 

-            if (empty) {
-                fprintf(stderr, "%s:%d: WARNING: empty '%s' span found in text '%s'\n",
+            /*
+             * This warning seems to be just an irritation to most people,
+             * since it is typically introduced by translators who then never
+             * see the warning.
+             */
+            if (0 && empty) {
+                fprintf(stderr, "%s:%d: warning: empty '%s' span found in text '%s'\n",

                         fileName, inXml->getLineNumber(),
                         String8(spanTag).string(), String8(*outString).string());
 
                         fileName, inXml->getLineNumber(),
                         String8(spanTag).string(), String8(*outString).string());
 


@@ -486,6 +491,7 @@ XMLNode::XMLNode(const String8& filename, const String16& s1, const String16& s2
 XMLNode::XMLNode(const String8& filename)
     : mFilename(filename)
 {
 XMLNode::XMLNode(const String8& filename)
     : mFilename(filename)
 {

+    memset(&mCharsValue, 0, sizeof(mCharsValue));

 }
 
 XMLNode::type XMLNode::getType() const
 }
 
 XMLNode::type XMLNode::getType() const