Skip to content
Snippets Groups Projects
Commit a1bd588f authored by deuce's avatar deuce
Browse files

Fix date parsing/setting code.

parent 4819f9e7
No related branches found
No related tags found
No related merge requests found
...@@ -603,8 +603,9 @@ static double js_DateGetMsecSinceEpoch(JSContext *cx, JSObject *obj) ...@@ -603,8 +603,9 @@ static double js_DateGetMsecSinceEpoch(JSContext *cx, JSObject *obj)
{ {
jsval rval; jsval rval;
if(!JS_CallFunctionName(cx, obj, "UTC", 0, NULL, &rval)) if(!JS_CallFunctionName(cx, obj, "getTime", 0, NULL, &rval)) {
return ((double)time(NULL))*1000; return ((double)time(NULL))*1000;
}
return JSVAL_TO_DOUBLE(rval); return JSVAL_TO_DOUBLE(rval);
} }
...@@ -660,10 +661,12 @@ js_iniGetValue(JSContext *cx, uintN argc, jsval *arglist) ...@@ -660,10 +661,12 @@ js_iniGetValue(JSContext *cx, uintN argc, jsval *arglist)
tt=(time_t)(js_DateGetMsecSinceEpoch(cx,dflt_obj)/1000.0); tt=(time_t)(js_DateGetMsecSinceEpoch(cx,dflt_obj)/1000.0);
rc=JS_SUSPENDREQUEST(cx); rc=JS_SUSPENDREQUEST(cx);
dbl=iniReadDateTime(p->fp,section,key,tt); dbl=iniReadDateTime(p->fp,section,key,tt);
dbl *= 1000;
JS_RESUMEREQUEST(cx, rc); JS_RESUMEREQUEST(cx, rc);
date_obj = JS_NewDateObjectMsec(cx, DOUBLE_TO_JSVAL(dbl)); date_obj = JS_NewDateObjectMsec(cx, dbl);
if(date_obj!=NULL) if(date_obj!=NULL) {
JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(date_obj)); JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(date_obj));
}
} }
else { else {
array = JS_NewArrayObject(cx, 0, NULL); array = JS_NewArrayObject(cx, 0, NULL);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment