diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /JavaScriptCore/jsc.cpp | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'JavaScriptCore/jsc.cpp')
| -rw-r--r-- | JavaScriptCore/jsc.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/JavaScriptCore/jsc.cpp b/JavaScriptCore/jsc.cpp index 252fb96..ae47d55 100644 --- a/JavaScriptCore/jsc.cpp +++ b/JavaScriptCore/jsc.cpp @@ -79,7 +79,7 @@ static JSValue JSC_HOST_CALL functionRun(ExecState*, JSObject*, JSValue, const A static JSValue JSC_HOST_CALL functionLoad(ExecState*, JSObject*, JSValue, const ArgList&); static JSValue JSC_HOST_CALL functionCheckSyntax(ExecState*, JSObject*, JSValue, const ArgList&); static JSValue JSC_HOST_CALL functionReadline(ExecState*, JSObject*, JSValue, const ArgList&); -static NO_RETURN JSValue JSC_HOST_CALL functionQuit(ExecState*, JSObject*, JSValue, const ArgList&); +static NO_RETURN_WITH_VALUE JSValue JSC_HOST_CALL functionQuit(ExecState*, JSObject*, JSValue, const ArgList&); #if ENABLE(SAMPLING_FLAGS) static JSValue JSC_HOST_CALL functionSetSamplingFlags(ExecState*, JSObject*, JSValue, const ArgList&); @@ -177,7 +177,7 @@ JSValue JSC_HOST_CALL functionPrint(ExecState* exec, JSObject*, JSValue, const A if (i) putchar(' '); - printf("%s", args.at(i).toString(exec).UTF8String().c_str()); + printf("%s", args.at(i).toString(exec).UTF8String().data()); } putchar('\n'); @@ -187,7 +187,7 @@ JSValue JSC_HOST_CALL functionPrint(ExecState* exec, JSObject*, JSValue, const A JSValue JSC_HOST_CALL functionDebug(ExecState* exec, JSObject*, JSValue, const ArgList& args) { - fprintf(stderr, "--> %s\n", args.at(0).toString(exec).UTF8String().c_str()); + fprintf(stderr, "--> %s\n", args.at(0).toString(exec).UTF8String().data()); return jsUndefined(); } @@ -346,7 +346,7 @@ int main(int argc, char** argv) // We can't use destructors in the following code because it uses Windows // Structured Exception Handling int res = 0; - JSGlobalData* globalData = JSGlobalData::create().releaseRef(); + JSGlobalData* globalData = JSGlobalData::create(ThreadStackTypeLarge).releaseRef(); TRY res = jscmain(argc, argv, globalData); EXCEPT(res = 3) @@ -445,7 +445,7 @@ static void runInteractive(GlobalObject* globalObject) if (completion.complType() == Throw) printf("Exception: %s\n", completion.value().toString(globalObject->globalExec()).ascii()); else - printf("%s\n", completion.value().toString(globalObject->globalExec()).UTF8String().c_str()); + printf("%s\n", completion.value().toString(globalObject->globalExec()).UTF8String().data()); globalObject->globalExec()->clearException(); } @@ -535,9 +535,9 @@ int jscmain(int argc, char** argv, JSGlobalData* globalData) static bool fillBufferWithContentsOfFile(const UString& fileName, Vector<char>& buffer) { - FILE* f = fopen(fileName.UTF8String().c_str(), "r"); + FILE* f = fopen(fileName.UTF8String().data(), "r"); if (!f) { - fprintf(stderr, "Could not open file: %s\n", fileName.UTF8String().c_str()); + fprintf(stderr, "Could not open file: %s\n", fileName.UTF8String().data()); return false; } |