Changeset 15328 in webkit for trunk/JavaScriptCore/API/minidom.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/minidom.c (modified) (2 diffs)

trunk/JavaScriptCore/API/minidom.c

@@ -40 +40 @@
     JSObjectRef globalObject = JSContextGetGlobalObject(context);
     
-    JSInternalStringRef printBuf = JSInternalStringCreateUTF8("print");
-    JSObjectSetProperty(context, globalObject, printBuf, JSFunctionMake(context, print), kJSPropertyAttributeNone);
-    JSInternalStringRelease(printBuf);
+    JSInternalStringRef printIString = JSInternalStringCreateUTF8("print");
+    JSObjectSetProperty(context, globalObject, printIString, JSFunctionMake(context, print), kJSPropertyAttributeNone);
+    JSInternalStringRelease(printIString);
     
-    JSInternalStringRef nodeBuf = JSInternalStringCreateUTF8("Node");
-    JSObjectSetProperty(context, globalObject, nodeBuf, JSConstructorMake(context, JSNode_construct), kJSPropertyAttributeNone);
-    JSInternalStringRelease(nodeBuf);
+    JSInternalStringRef node = JSInternalStringCreateUTF8("Node");
+    JSObjectSetProperty(context, globalObject, node, JSConstructorMake(context, JSNode_construct), kJSPropertyAttributeNone);
+    JSInternalStringRelease(node);
     
-    char* script = createStringWithContentsOfFile("minidom.js");
-    JSInternalStringRef scriptBuf = JSInternalStringCreateUTF8(script);
+    char* scriptUTF8 = createStringWithContentsOfFile("minidom.js");
+    JSInternalStringRef script = JSInternalStringCreateUTF8(scriptUTF8);
     JSValueRef exception;
-    JSValueRef result = JSEvaluate(context, scriptBuf, NULL, NULL, 0, &exception);
+    JSValueRef result = JSEvaluate(context, script, NULL, NULL, 0, &exception);
     if (result)
         printf("PASS: Test script executed successfully.\n");
     else {
         printf("FAIL: Test script threw exception:\n");
-        JSInternalStringRef exceptionBuf = JSValueCopyStringValue(context, exception);
-        CFStringRef exceptionCF = CFStringCreateWithJSInternalString(kCFAllocatorDefault, exceptionBuf);
+        JSInternalStringRef exceptionIString = JSValueCopyStringValue(context, exception);
+        CFStringRef exceptionCF = CFStringCreateWithJSInternalString(kCFAllocatorDefault, exceptionIString);
         CFShow(exceptionCF);
         CFRelease(exceptionCF);
-        JSInternalStringRelease(exceptionBuf);
+        JSInternalStringRelease(exceptionIString);
     }
-    JSInternalStringRelease(scriptBuf);
-    free(script);
+    JSInternalStringRelease(script);
+    free(scriptUTF8);
 
 #if 0 // used for leak/finalize debugging    
@@ -82 +82 @@
 {
     if (argc > 0) {
-        JSInternalStringRef stringBuf = JSValueCopyStringValue(context, argv[0]);
-        size_t numChars = JSInternalStringGetMaxLengthUTF8(stringBuf);
-        char string[numChars];
-        JSInternalStringGetCharactersUTF8(stringBuf, string, numChars);
-        printf("%s\n", string);
+        JSInternalStringRef string = JSValueCopyStringValue(context, argv[0]);
+        size_t numChars = JSInternalStringGetMaxLengthUTF8(string);
+        char stringUTF8[numChars];
+        JSInternalStringGetCharactersUTF8(string, stringUTF8, numChars);
+        printf("%s\n", stringUTF8);
     }