aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2015-03-26 12:07:00 +0100
committerRickard Green <[email protected]>2015-03-26 12:07:00 +0100
commit2e016f6cde89bf471269c89f0fd2bb40422ce204 (patch)
treee505e8dc133cb6628d5581992c875cd07117d70e /erts/preloaded/src
parent047811828ebac3c4909b8056b8268205c34b693c (diff)
downloadotp-2e016f6cde89bf471269c89f0fd2bb40422ce204.tar.gz
otp-2e016f6cde89bf471269c89f0fd2bb40422ce204.tar.bz2
otp-2e016f6cde89bf471269c89f0fd2bb40422ce204.zip
Misc fixes
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/erlang.erl2
-rw-r--r--erts/preloaded/src/erts_internal.erl12
2 files changed, 7 insertions, 7 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index c5dc40f5d1..60ca02861a 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -1732,7 +1732,7 @@ start_timer(0, Dest, Msg) ->
orelse (erlang:is_atom(Dest)
andalso Dest /= undefined)),
TimerRef = erlang:make_ref(),
- try Dest ! {timeout, TimerRef, Msg} catch _:_ -> ok end,
+ _ = try Dest ! {timeout, TimerRef, Msg} catch _:_ -> ok end,
TimerRef
catch
_:_ ->
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index 2c701d75e4..3580fb542d 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -232,7 +232,7 @@ create_bif_timer() ->
-spec erts_internal:access_bif_timer(Ref) -> Res when
Ref :: reference(),
- Res :: {reference(), pid(), reference()}.
+ Res :: {reference(), pid()} | 'undefined'.
access_bif_timer(_Ref) ->
erlang:nif_error(undefined).
@@ -352,7 +352,7 @@ tsrv_handle_msg({cancel_timeout, BTR, From, Reply, Req, TRef},
false ->
ok;
_ ->
- try From ! {cancel_timer, Req, false} catch _:_ -> ok end
+ _ = try From ! {cancel_timer, Req, false} catch _:_ -> ok end
end,
Nxt;
[{Time, TRef} = TKey] ->
@@ -370,7 +370,7 @@ tsrv_handle_msg({cancel_timeout, BTR, From, Reply, Req, TRef},
false ->
((1000*(Time - RcvTime)) div Unit)
end,
- try From ! {cancel_timer, Req, RT} catch _:_ -> ok end
+ _ = try From ! {cancel_timer, Req, RT} catch _:_ -> ok end
end,
case Time =:= Nxt of
false ->
@@ -389,14 +389,14 @@ tsrv_handle_msg({read_timeout, BTR, From, Req, TRef},
Nxt) ->
case ets:lookup(RTab, TRef) of
[] ->
- try From ! {read_timer, Req, false} catch _:_ -> ok end;
+ _ = try From ! {read_timer, Req, false} catch _:_ -> ok end;
[{Time, TRef}] ->
RcvTime = erlang:monotonic_time(),
RT = case Time =< RcvTime of
true -> 0;
false -> (1000*(Time - RcvTime)) div Unit
end,
- try From ! {read_timer, Req, RT} catch _:_ -> ok end
+ _ = try From ! {read_timer, Req, RT} catch _:_ -> ok end
end,
Nxt;
tsrv_handle_msg({'DOWN', TRef, process, _, _},
@@ -456,6 +456,6 @@ tsrv_handle_timeout(CallTime, #tsrv_state{rtab = RTab,
end,
ets:delete(TTab, TKey),
ets:delete(RTab, TRef),
- try Proc ! Msg catch _:_ -> ok end,
+ _ = try Proc ! Msg catch _:_ -> ok end,
tsrv_handle_timeout(CallTime, S)
end.