am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index 970a38152e8df0a39efe806f04111620785bb3c4..51af9650612e79557b61fdcfa518ea1f4e188b9d 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -401,7 +401,7 @@ int doDump(Bundle* bundle)
             ResXMLTree tree;
             asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
             if (asset == NULL) {
             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;
             }
 
                 goto bail;
             }
 


@@ -428,7 +428,7 @@ int doDump(Bundle* bundle)
             ResXMLTree tree;
             asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
             if (asset == NULL) {
             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;
             }
 
                 goto bail;
             }