From: The Android Automerger <android-build@android.com>
Date: Thu, 9 Dec 2010 15:21:54 +0000 (-0800)
Subject: Merge branch 'master' into honeycomb-release
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/2cb0f6e073c305097694e7332906d80146b3a9ee?hp=3c8a9401edb6b5e23e9f4d1c2a3c5e0239020b08

Merge branch 'master' into honeycomb-release
---

diff --git a/Package.cpp b/Package.cpp
index faae89b..ab71f34 100644
--- a/Package.cpp
+++ b/Package.cpp
@@ -461,7 +461,7 @@ ssize_t processJarFiles(Bundle* bundle, ZipFile* zip)
         ZipFile jar;
         err = jar.open(jars[i], ZipFile::kOpenReadOnly);
         if (err != 0) {
-            fprintf(stderr, "ERROR: unable to open '%s' as a zip file: %zd\n",
+            fprintf(stderr, "ERROR: unable to open '%s' as a zip file: %d\n",
                 jars[i], err);
             return err;
         }
diff --git a/Resource.cpp b/Resource.cpp
index 7b74506..4614d6f 100644
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -542,11 +542,11 @@ static bool applyFileOverlay(Bundle *bundle,
                         DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > baseFiles =
                                 baseGroup->getFiles();
                         for (size_t i=0; i < baseFiles.size(); i++) {
-                            printf("baseFile %d has flavor %s\n", i,
+                            printf("baseFile %zd has flavor %s\n", i,
                                     baseFiles.keyAt(i).toString().string());
                         }
                         for (size_t i=0; i < overlayFiles.size(); i++) {
-                            printf("overlayFile %d has flavor %s\n", i,
+                            printf("overlayFile %zd has flavor %s\n", i,
                                     overlayFiles.keyAt(i).toString().string());
                         }
                     }
@@ -560,7 +560,7 @@ static bool applyFileOverlay(Bundle *bundle,
                                 keyAt(overlayGroupIndex));
                         if(baseFileIndex < UNKNOWN_ERROR) {
                             if (bundle->getVerbose()) {
-                                printf("found a match (%d) for overlay file %s, for flavor %s\n",
+                                printf("found a match (%zd) for overlay file %s, for flavor %s\n",
                                         baseFileIndex,
                                         overlayGroup->getLeaf().string(),
                                         overlayFiles.keyAt(overlayGroupIndex).toString().string());
diff --git a/StringPool.cpp b/StringPool.cpp
index e28bdff..d067d59 100644
--- a/StringPool.cpp
+++ b/StringPool.cpp
@@ -30,7 +30,7 @@ void printStringPool(const ResStringPool* pool)
             str = String8(pool->stringAt(s, &len)).string();
         }
 
-        printf("String #%d: %s\n", s, str);
+        printf("String #%zd: %s\n", s, str);
     }
 }