From: Kenny Root <kroot@google.com>
Date: Wed, 9 Dec 2009 23:51:21 +0000 (-0800)
Subject: am e6c0e993: Merge change I129483f8 into eclair-mr2
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/604ed8f9f41f26df9f70889b874088c4cea5d36e?ds=inline;hp=-c

am e6c0e993: Merge change I129483f8 into eclair-mr2

Merge commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp

* commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b':
  Optional use of UTF-8 strings in resource bundles
---

604ed8f9f41f26df9f70889b874088c4cea5d36e
diff --combined Command.cpp
index 4067735,ff9cc11..990a7ea
--- a/Command.cpp
+++ b/Command.cpp
@@@ -401,7 -401,7 +401,7 @@@ int doDump(Bundle* bundle
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -412,6 -412,7 +412,7 @@@
              }
              tree.restart();
              printXMLBlock(&tree);
+             tree.uninit();
              delete asset;
              asset = NULL;
          }
@@@ -427,7 -428,7 +428,7 @@@
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }