From dce34655c5b26f0e285dc2ef35542ba6c7adcbf5 Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Thu, 8 Feb 2007 21:21:06 +0000 Subject: [PATCH] Trailing whitespace police raid. git-svn-id: svn://10.0.0.236/trunk@219769 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/jsfile.c | 6 +++--- mozilla/js/src/jsgc.c | 6 +++--- mozilla/js/src/jsparse.c | 6 +++--- mozilla/js/src/prmjtime.c | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mozilla/js/src/jsfile.c b/mozilla/js/src/jsfile.c index ac769d0e937..bb9f5fb5adf 100644 --- a/mozilla/js/src/jsfile.c +++ b/mozilla/js/src/jsfile.c @@ -991,7 +991,7 @@ js_FileWrite(JSContext *cx, JSFile *file, jschar *buf, int32 len, int32 mode) } i+=j; } - j = (!file->isNative) + j = (!file->isNative) ? PR_Write(file->handle, utfbuf, i) : fwrite(utfbuf, 1, i, file->nativehandle); @@ -1003,7 +1003,7 @@ js_FileWrite(JSContext *cx, JSFile *file, jschar *buf, int32 len, int32 mode) break; case UCS2: - count = (!file->isNative) + count = (!file->isNative) ? PR_Write(file->handle, buf, len*2) >> 1 : fwrite(buf, 1, len*2, file->nativehandle) >> 1; @@ -2188,7 +2188,7 @@ file_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = OBJECT_TO_JSVAL(obj); } - str = (argc == 0) + str = (argc == 0) ? JS_InternString(cx, "") : JS_ValueToString(cx, argv[0]); diff --git a/mozilla/js/src/jsgc.c b/mozilla/js/src/jsgc.c index c49b33944dd..661d1b24c02 100644 --- a/mozilla/js/src/jsgc.c +++ b/mozilla/js/src/jsgc.c @@ -2105,7 +2105,7 @@ MarkGCThingChildren(JSContext *cx, void *thing, uint8 *flagp, next_thing = JSVAL_TO_GCTHING(v); next_flagp = js_GetGCThingFlags(next_thing); if (rt->gcThingCallback) { - rt->gcThingCallback(next_thing, *next_flagp, + rt->gcThingCallback(next_thing, *next_flagp, rt->gcThingCallbackClosure); } if (next_thing == thing) @@ -2163,7 +2163,7 @@ MarkGCThingChildren(JSContext *cx, void *thing, uint8 *flagp, thing = JSSTRDEP_BASE(str); flagp = js_GetGCThingFlags(thing); if (rt->gcThingCallback) { - rt->gcThingCallback(thing, *flagp, + rt->gcThingCallback(thing, *flagp, rt->gcThingCallbackClosure); } if (*flagp & GCF_MARK) @@ -2478,7 +2478,7 @@ js_MarkGCThing(JSContext *cx, void *thing) JS_ASSERT(*flagp != GCF_FINAL); if (cx->runtime->gcThingCallback) { - cx->runtime->gcThingCallback(thing, *flagp, + cx->runtime->gcThingCallback(thing, *flagp, cx->runtime->gcThingCallbackClosure); } diff --git a/mozilla/js/src/jsparse.c b/mozilla/js/src/jsparse.c index 966a4d92871..3934144fa16 100644 --- a/mozilla/js/src/jsparse.c +++ b/mozilla/js/src/jsparse.c @@ -1238,7 +1238,7 @@ FunctionDef(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc, /* * Temporarily transfer the owneship of the recycle list to * funtc. See bug 313967. - */ + */ funtc.nodeList = tc->nodeList; tc->nodeList = NULL; lhs = DestructuringExpr(cx, &data, &funtc, tt); @@ -1313,13 +1313,13 @@ FunctionDef(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc, /* * Temporarily transfer the owneship of the recycle list to funtc. * See bug 313967. - */ + */ funtc.nodeList = tc->nodeList; tc->nodeList = NULL; body = FunctionBody(cx, ts, fun, &funtc); tc->nodeList = funtc.nodeList; funtc.nodeList = NULL; - + if (!body) return NULL; diff --git a/mozilla/js/src/prmjtime.c b/mozilla/js/src/prmjtime.c index 4356a295ffe..df7f838463c 100644 --- a/mozilla/js/src/prmjtime.c +++ b/mozilla/js/src/prmjtime.c @@ -349,11 +349,11 @@ PRMJ_basetime(JSInt64 tsecs, PRMJTime *prtm) JSInt64 result; JSInt64 result1; JSInt64 result2; - + JSInt64 base; /* Some variables for intermediate result storage to make computing isleap - easier/faster */ + easier/faster */ JSInt32 fourCenturyBlocks; JSInt32 centuriesLeft; JSInt32 fourYearBlocksLeft; @@ -369,7 +369,7 @@ PRMJ_basetime(JSInt64 tsecs, PRMJTime *prtm) JSLL_I2L(fourYears, PRMJ_FOUR_YEARS_DAYS); JSLL_MUL(fourYears, fourYears, result); - + JSLL_I2L(century, PRMJ_CENTURY_DAYS); JSLL_MUL(century, century, result); @@ -428,7 +428,7 @@ PRMJ_basetime(JSInt64 tsecs, PRMJTime *prtm) (yearsLeft == 3) && (fourYearBlocksLeft != 24 || centuriesLeft == 3); JS_ASSERT(isleap == ((year % 4 == 0) && (year % 100 != 0 || year % 400 == 0))); - + JSLL_UI2L(result1,PRMJ_DAY_SECONDS); JSLL_DIV(result,tsecs,result1);