am 799a5a61: am 2533a6ad: set up fast-forward from froyo-release to gingerbread

[android/aapt.git] / StringPool.cpp

diff --git a/StringPool.cpp b/StringPool.cpp
index 51afc0a946cc38d617c1144743609c98dfb19fe5..e28bdff410b0a9a28e9978129c1e6e28a956d795 100644 (file)
--- a/StringPool.cpp
+++ b/StringPool.cpp
@@ -25,8 +25,12 @@ void printStringPool(const ResStringPool* pool)
     const size_t NS = pool->size();
     for (size_t s=0; s<NS; s++) {
         size_t len;
-        printf("String #%ld: %s\n", s,
-                String8(pool->stringAt(s, &len)).string());
+        const char *str = (const char*)pool->string8At(s, &len);
+        if (str == NULL) {
+            str = String8(pool->stringAt(s, &len)).string();
+        }
+
+        printf("String #%d: %s\n", s, str);
     }
 }