Changeset 15328 in webkit for trunk/JavaScriptCore/API/JSNode.c

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/JSNode.c (modified) (2 diffs)

trunk/JavaScriptCore/API/JSNode.c

@@ -40 +40 @@
     // Example of throwing a type error for invalid values
     if (!JSValueIsObjectOfClass(thisObject, JSNode_class(context))) {
-        JSInternalStringRef messageBuf = JSInternalStringCreateUTF8("TypeError: appendChild can only be called on nodes");
-        *exception = JSStringMake(messageBuf);
-        JSInternalStringRelease(messageBuf);
+        JSInternalStringRef message = JSInternalStringCreateUTF8("TypeError: appendChild can only be called on nodes");
+        *exception = JSStringMake(message);
+        JSInternalStringRelease(message);
     } else if (argc < 1 || !JSValueIsObjectOfClass(argv[0], JSNode_class(context))) {
-        JSInternalStringRef messageBuf = JSInternalStringCreateUTF8("TypeError: first argument to appendChild must be a node");
-        *exception = JSStringMake(messageBuf);
-        JSInternalStringRelease(messageBuf);
+        JSInternalStringRef message = JSInternalStringCreateUTF8("TypeError: first argument to appendChild must be a node");
+        *exception = JSStringMake(message);
+        JSInternalStringRelease(message);
     } else {
         Node* node = JSObjectGetPrivate(thisObject);
@@ -121 +121 @@
     Node* node = JSObjectGetPrivate(object);
     if (node) {
-        JSInternalStringRef nodeBuf = JSInternalStringCreateUTF8(node->nodeType);
-        *returnValue = JSStringMake(nodeBuf);
-        JSInternalStringRelease(nodeBuf);
+        JSInternalStringRef nodeType = JSInternalStringCreateUTF8(node->nodeType);
+        *returnValue = JSStringMake(nodeType);
+        JSInternalStringRelease(nodeType);
         return true;
     }