From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 3 Sep 2009 22:18:14 +0000 (-0700)
Subject: merge from donut
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/811c16f33b5cbd60df68bf0d087c4fdfdaa87ceb?hp=0e5d65b1702bf07a7e9ae333189419fee60d954c

merge from donut
---

diff --git a/Command.cpp b/Command.cpp
index 5f80ade..7e6a12c 100644
--- a/Command.cpp
+++ b/Command.cpp
@@ -397,7 +397,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;
             }
 
@@ -423,7 +423,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;
             }
 
diff --git a/StringPool.cpp b/StringPool.cpp
index 878d3b1..715170a 100644
--- a/StringPool.cpp
+++ b/StringPool.cpp
@@ -228,7 +228,7 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool)
         }
         dat += (preSize+strPos)/sizeof(uint16_t);
         if (lenSize > sizeof(uint16_t)) {
-            *dat = htods(0x8000 | ((strSize>>16)&0x7ffff));
+            *dat = htods(0x8000 | ((strSize>>16)&0x7fff));
             dat++;
         }
         *dat++ = htods(strSize);