commit a060ed959efb8d57419edc3c5c1fa48372cc6588
author Shih-wei Liao <sliao@google.com> Thu Jun 07 09:25:28 2012 -0700
committer Shih-wei Liao <sliao@google.com> Thu Jun 07 09:32:37 2012 -0700
tree 5d40e49f8f9f7cbcf2a1a5be1d800b8ab03d8f21
parent b65c9244ff8999fd62aecd86494886c61a50a60c

Fix error meessages in DexFile::ChangePermissions() and mem_map.cc.

Change-Id: I9be999b61b0fca1ab9cad7521346681d2370f1c4

src/dex_file.cc

diff --git a/src/dex_file.cc b/src/dex_file.cc
index 3ba671e..cca1a30 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -96,7 +96,7 @@
 }
 
 void DexFile::ChangePermissions(int prot) const {
-  mem_map_->Protect(prot);
+  CHECK(mem_map_->Protect(prot)) << GetLocation();
 }
 
 const DexFile* DexFile::OpenFile(const std::string& filename,

src/mem_map.cc

diff --git a/src/mem_map.cc b/src/mem_map.cc
index 8201fa8..d3ebd4a 100644
--- a/src/mem_map.cc
+++ b/src/mem_map.cc
@@ -233,7 +233,8 @@
     return true;
   }
 
-  PLOG(ERROR) << "mprotect(" << base_begin_ << ", " << base_size_ << ", " << prot << ") failed";
+  PLOG(ERROR) << "mprotect(" << reinterpret_cast<void*>(base_begin_) << ", " << base_size_ << ", "
+              << prot << ") failed";
   return false;
 }