commit 5174fe6e4e931c423e910366ff22ce0838567940
author Elliott Hughes <enh@google.com> Tue Aug 23 15:12:35 2011 -0700
committer Elliott Hughes <enh@google.com> Tue Aug 23 15:12:35 2011 -0700
tree 6eaa36ae0cfb476ddfac9fcf46c2a3918d9510f6
parent 814e40397fe6c8a2c645bae99f356dbddd6dbe18

Add the condition variable to System.loadLibrary and implement UnregisterNatives.

Also change PrettyDescriptor now descriptors are String*s rather than StringPiece&s.

Change-Id: Id07affb26038f5f4a3bee4396c65f71d7bc38be3

src/utils.cc

diff --git a/src/utils.cc b/src/utils.cc
index f8a55ce..c24504e 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -25,9 +25,11 @@
   return contents;
 }
 
-std::string PrettyDescriptor(const StringPiece& descriptor) {
+std::string PrettyDescriptor(const String* java_descriptor) {
+  std::string descriptor(java_descriptor->ToModifiedUtf8());
+
   // Count the number of '['s to get the dimensionality.
-  const char* c = descriptor.data();
+  const char* c = descriptor.c_str();
   size_t dim = 0;
   while (*c == '[') {
     dim++;
@@ -51,7 +53,7 @@
     case 'J': c = "long;"; break;
     case 'S': c = "short;"; break;
     case 'Z': c = "boolean;"; break;
-    default: return descriptor.ToString();
+    default: return descriptor;
     }
   }
 
@@ -78,7 +80,7 @@
     return "null";
   }
   Class* c = m->GetDeclaringClass();
-  std::string result(PrettyDescriptor(c->GetDescriptor()->ToModifiedUtf8()));
+  std::string result(PrettyDescriptor(c->GetDescriptor()));
   result += '.';
   result += m->GetName()->ToModifiedUtf8();
   if (with_signature) {
@@ -96,9 +98,9 @@
   if (obj->GetClass() == NULL) {
     return "(raw)";
   }
-  std::string result(PrettyDescriptor(obj->GetClass()->GetDescriptor()->ToModifiedUtf8()));
+  std::string result(PrettyDescriptor(obj->GetClass()->GetDescriptor()));
   if (obj->IsClass()) {
-    result += "<" + PrettyDescriptor(obj->AsClass()->GetDescriptor()->ToModifiedUtf8()) + ">";
+    result += "<" + PrettyDescriptor(obj->AsClass()->GetDescriptor()) + ">";
   }
   return result;
 }