Changeset 15328 in webkit for trunk/JavaScriptCore/API/JSInternalStringRef.cpp

Timestamp:

Jul 10, 2006, 10:37:00 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Darin.

• Changed public header includes to the <JavaScriptCore/ style.
• Changed instances of 'buffer' to 'string' since we decided on JSInternalString instead of JSStringBuffer.

• API/JSContextRef.h:
• API/JSInternalStringRef.cpp: (JSStringMake): (JSInternalStringRetain): (JSInternalStringRelease): (JSValueCopyStringValue): (JSInternalStringGetLength): (JSInternalStringGetCharactersPtr): (JSInternalStringGetCharacters): (JSInternalStringGetMaxLengthUTF8): (JSInternalStringGetCharactersUTF8): (CFStringCreateWithJSInternalString):
• API/JSInternalStringRef.h:
• API/JSNode.c: (JSNodePrototype_appendChild): (JSNode_getNodeType):
• API/JSObjectRef.cpp: (JSObjectCallAsConstructor):
• API/JSValueRef.h:
• API/JavaScriptCore.h:
• API/minidom.c: (main): (print):
• API/testapi.c: (MyObject_getPropertyList): (myConstructor_callAsConstructor): (main): I noticed that we were prematurely releasing some string buffers, so I moved their release calls to the end of main(). I got rid of 'Buf' in *Buf (sometimes changing to 'IString', when necessary to differentiate a variable) to match the buffer->string change.

File:

• trunk/JavaScriptCore/API/JSInternalStringRef.cpp (modified) (5 diffs)

trunk/JavaScriptCore/API/JSInternalStringRef.cpp

@@ -37 +37 @@
 using namespace KJS;
 
-JSValueRef JSStringMake(JSInternalStringRef buffer)
+JSValueRef JSStringMake(JSInternalStringRef string)
 {
     JSLock lock;
-    UString::Rep* rep = toJS(buffer);
+    UString::Rep* rep = toJS(string);
     return toRef(jsString(UString(rep)));
 }
@@ -58 +58 @@
 }
 
-JSInternalStringRef JSInternalStringRetain(JSInternalStringRef buffer)
+JSInternalStringRef JSInternalStringRetain(JSInternalStringRef string)
 {
-    UString::Rep* rep = toJS(buffer);
+    UString::Rep* rep = toJS(string);
     return toRef(rep->ref());
 }
 
-void JSInternalStringRelease(JSInternalStringRef buffer)
+void JSInternalStringRelease(JSInternalStringRef string)
 {
     JSLock lock;
-    UString::Rep* rep = toJS(buffer);
+    UString::Rep* rep = toJS(string);
     rep->deref();
 }
@@ -77 +77 @@
     ExecState* exec = toJS(context);
 
-    JSInternalStringRef charBufferRef = toRef(jsValue->toString(exec).rep()->ref());
+    JSInternalStringRef stringRef = toRef(jsValue->toString(exec).rep()->ref());
     if (exec->hadException())
         exec->clearException();
-    return charBufferRef;
+    return stringRef;
 }
 
-size_t JSInternalStringGetLength(JSInternalStringRef buffer)
+size_t JSInternalStringGetLength(JSInternalStringRef string)
 {
-    UString::Rep* rep = toJS(buffer);
+    UString::Rep* rep = toJS(string);
     return rep->size();
 }
 
-const JSChar* JSInternalStringGetCharactersPtr(JSInternalStringRef buffer)
+const JSChar* JSInternalStringGetCharactersPtr(JSInternalStringRef string)
 {
-    UString::Rep* rep = toJS(buffer);
+    UString::Rep* rep = toJS(string);
     return reinterpret_cast<const JSChar*>(rep->data());
 }
 
-void JSInternalStringGetCharacters(JSInternalStringRef inBuffer, JSChar* outBuffer, size_t numChars)
+void JSInternalStringGetCharacters(JSInternalStringRef string, JSChar* buffer, size_t numChars)
 {
-    UString::Rep* rep = toJS(inBuffer);
+    UString::Rep* rep = toJS(string);
     const JSChar* data = reinterpret_cast<const JSChar*>(rep->data());
     
-    memcpy(outBuffer, data, numChars * sizeof(JSChar));
+    memcpy(buffer, data, numChars * sizeof(JSChar));
 }
 
-size_t JSInternalStringGetMaxLengthUTF8(JSInternalStringRef buffer)
+size_t JSInternalStringGetMaxLengthUTF8(JSInternalStringRef string)
 {
-    UString::Rep* rep = toJS(buffer);
+    UString::Rep* rep = toJS(string);
     
     // Any UTF8 character > 3 bytes encodes as a UTF16 surrogate pair.
@@ -111 +111 @@
 }
 
-size_t JSInternalStringGetCharactersUTF8(JSInternalStringRef inBuffer, char* outBuffer, size_t bufferSize)
+size_t JSInternalStringGetCharactersUTF8(JSInternalStringRef string, char* buffer, size_t bufferSize)
 {
     JSLock lock;
-    UString::Rep* rep = toJS(inBuffer);
+    UString::Rep* rep = toJS(string);
     CString cString = UString(rep).UTF8String();
 
     size_t length = std::min(bufferSize, cString.size() + 1); // + 1 for terminating '\0'
-    memcpy(outBuffer, cString.c_str(), length);
+    memcpy(buffer, cString.c_str(), length);
     return length;
 }
@@ -157 +157 @@
 }
 
-CFStringRef CFStringCreateWithJSInternalString(CFAllocatorRef alloc, JSInternalStringRef buffer)
+CFStringRef CFStringCreateWithJSInternalString(CFAllocatorRef alloc, JSInternalStringRef string)
 {
-    UString::Rep* rep = toJS(buffer);
+    UString::Rep* rep = toJS(string);
     return CFStringCreateWithCharacters(alloc, reinterpret_cast<const JSChar*>(rep->data()), rep->size());
 }