commit d8a3f9fa1951e552f5f65c2914689083cc0c46c2
author Elliott Hughes <enh@google.com> Fri Jun 17 15:59:16 2011 -0700
committer Elliott Hughes <enh@google.com> Fri Jun 17 16:46:08 2011 -0700
tree e297eb5d43751f2e66ca2f143eed692e8fb1b2ba
parent 837eabb829417c1542037423c55536649de404b8

Make some of the StringObject functions member functions.

Change-Id: I72ed13c16f0cb24498772c453ba268a0f65f208a

vm/Ddm.cpp

diff --git a/vm/Ddm.cpp b/vm/Ddm.cpp
index ff853e5..e370204 100644
--- a/vm/Ddm.cpp
+++ b/vm/Ddm.cpp
@@ -246,8 +246,9 @@
  */
 void dvmDdmSendThreadNotification(Thread* thread, bool started)
 {
-    if (!gDvm.ddmThreadNotification)
+    if (!gDvm.ddmThreadNotification) {
         return;
+    }
 
     StringObject* nameObj = NULL;
     Object* threadObj = thread->threadObj;
@@ -268,16 +269,17 @@
         type = CHUNK_TYPE("THCR");
 
         if (nameObj != NULL) {
-            stringLen = dvmStringLen(nameObj);
-            chars = dvmStringChars(nameObj);
+            stringLen = nameObj->length();
+            chars = nameObj->chars();
         } else {
             stringLen = 0;
             chars = NULL;
         }
 
         /* leave room for the two integer fields */
-        if (stringLen > (sizeof(buf) - sizeof(u4)*2) / 2)
+        if (stringLen > (sizeof(buf) - sizeof(u4)*2) / 2) {
             stringLen = (sizeof(buf) - sizeof(u4)*2) / 2;
+        }
         len = stringLen*2 + sizeof(u4)*2;
 
         set4BE(&buf[0x00], thread->threadId);
@@ -285,8 +287,9 @@
 
         /* copy the UTF-16 string, transforming to big-endian */
         outChars = (u2*)(void*)&buf[0x08];
-        while (stringLen--)
+        while (stringLen--) {
             set2BE((u1*) (outChars++), *chars++);
+        }
     } else {
         type = CHUNK_TYPE("THDE");
 
@@ -303,11 +306,12 @@
  */
 void dvmDdmSendThreadNameChange(int threadId, StringObject* newName)
 {
-    if (!gDvm.ddmThreadNotification)
+    if (!gDvm.ddmThreadNotification) {
         return;
+    }
 
-    size_t stringLen = dvmStringLen(newName);
-    const u2* chars = dvmStringChars(newName);
+    size_t stringLen = newName->length();
+    const u2* chars = newName->chars();
 
     /*
      * Output format:
@@ -321,8 +325,9 @@
     set4BE(&buf[0x00], threadId);
     set4BE(&buf[0x04], stringLen);
     u2* outChars = (u2*)(void*)&buf[0x08];
-    while (stringLen--)
+    while (stringLen--) {
         set2BE((u1*) (outChars++), *chars++);
+    }
 
     dvmDbgDdmSendChunk(CHUNK_TYPE("THNM"), bufLen, buf);
 }