Commit 020245bb authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

jscript: Fixed some clang warnings.

parent c0ab3694
...@@ -133,6 +133,9 @@ static HRESULT Array_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP ...@@ -133,6 +133,9 @@ static HRESULT Array_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP
HRESULT hres; HRESULT hres;
hres = to_number(ctx, get_arg(dp, 0), ei, &num); hres = to_number(ctx, get_arg(dp, 0), ei, &num);
if(FAILED(hres))
return hres;
if(V_VT(&num) == VT_I4) if(V_VT(&num) == VT_I4)
len = V_I4(&num); len = V_I4(&num);
else else
......
...@@ -2415,7 +2415,7 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t ...@@ -2415,7 +2415,7 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t
} }
VariantClear(&val); VariantClear(&val);
return S_OK; return hres;
} }
HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
......
...@@ -441,6 +441,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI ...@@ -441,6 +441,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI
} }
} }
if(SUCCEEDED(hres))
hres = call_function(ctx, function, this_obj, &args, retv, ei, caller); hres = call_function(ctx, function, this_obj, &args, retv, ei, caller);
if(this_obj) if(this_obj)
......
...@@ -522,6 +522,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, ...@@ -522,6 +522,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface,
item->flags = dwFlags; item->flags = dwFlags;
item->name = heap_strdupW(pstrName); item->name = heap_strdupW(pstrName);
if(!item->name) { if(!item->name) {
if(disp)
IDispatch_Release(disp); IDispatch_Release(disp);
heap_free(item); heap_free(item);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
......
...@@ -249,7 +249,6 @@ static BOOL unescape(WCHAR *str) ...@@ -249,7 +249,6 @@ static BOOL unescape(WCHAR *str)
} }
p++; p++;
c = 0;
switch(*p) { switch(*p) {
case '\'': case '\'':
......
...@@ -150,7 +150,7 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D ...@@ -150,7 +150,7 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D
if(exp) { if(exp) {
if(log_radix==0) if(log_radix==0)
buf[idx++] = '\0'; buf[idx] = 0;
else { else {
static const WCHAR formatW[] = {'(','e','%','c','%','d',')',0}; static const WCHAR formatW[] = {'(','e','%','c','%','d',')',0};
WCHAR ch; WCHAR ch;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment