diff options
author | Hans Bolinder <[email protected]> | 2013-05-06 12:16:38 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2013-05-06 12:16:38 +0200 |
commit | 551d92fead40277f2152a7351ed6ab19b623b16b (patch) | |
tree | 7812afb9446ff1c7a8596a266a1cbd81eacc5f96 /lib/kernel/src/net_kernel.erl | |
parent | 0dc5a00011d1d24b68c9d43ff608415f84c50499 (diff) | |
parent | 2324dec9fb37e301413c74acf1dce8ae3c29fc48 (diff) | |
download | otp-551d92fead40277f2152a7351ed6ab19b623b16b.tar.gz otp-551d92fead40277f2152a7351ed6ab19b623b16b.tar.bz2 otp-551d92fead40277f2152a7351ed6ab19b623b16b.zip |
Merge branch 'hb/unmatched_returns/OTP-10908'
* hb/unmatched_returns/OTP-10908:
Fix unmatched_returns warnings in Kernel
Fix a minor bug in ets:tabfile_info() and ets:file2tab()
Fix unmatched_returns warning in Kernel
Fix unmatched_return warnings in sasl
Fix unmatched_return warnings in kernel
Fix unmatched_return warning in erl_prim_loader
Fix unmatched_return warnings in stdlib
Fix unmatched_returns warnings in STDLIB and Kernel
Diffstat (limited to 'lib/kernel/src/net_kernel.erl')
-rw-r--r-- | lib/kernel/src/net_kernel.erl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl index dd0071b914..04a0d94ebf 100644 --- a/lib/kernel/src/net_kernel.erl +++ b/lib/kernel/src/net_kernel.erl @@ -306,21 +306,21 @@ do_connect(Node, Type, WaitForBarred) -> %% Type = normal | hidden end. passive_connect_monitor(Parent, Node) -> - monitor_nodes(true,[{node_type,all}]), + ok = monitor_nodes(true,[{node_type,all}]), case lists:member(Node,nodes([connected])) of true -> - monitor_nodes(false,[{node_type,all}]), + ok = monitor_nodes(false,[{node_type,all}]), Parent ! {self(),true}; _ -> Ref = make_ref(), Tref = erlang:send_after(connecttime(),self(),Ref), receive Ref -> - monitor_nodes(false,[{node_type,all}]), + ok = monitor_nodes(false,[{node_type,all}]), Parent ! {self(), false}; {nodeup,Node,_} -> - monitor_nodes(false,[{node_type,all}]), - erlang:cancel_timer(Tref), + ok = monitor_nodes(false,[{node_type,all}]), + _ = erlang:cancel_timer(Tref), Parent ! {self(),true} end end. @@ -734,7 +734,7 @@ handle_info(transition_period_end, how = How}} = State) -> ?tckr_dbg(transition_period_ended), case How of - shorter -> Tckr ! {new_ticktime, T}; + shorter -> Tckr ! {new_ticktime, T}, done; _ -> done end, {noreply,State#state{tick = #tick{ticker = Tckr, time = T}}}; @@ -1573,9 +1573,10 @@ async_gen_server_reply(From, Msg) -> ok -> ok; nosuspend -> - spawn(fun() -> catch erlang:send(Pid, M, [noconnect]) end); + _ = spawn(fun() -> catch erlang:send(Pid, M, [noconnect]) end), + ok; noconnect -> ok; % The gen module takes care of this case. - {'EXIT', _}=EXIT -> - EXIT + {'EXIT', _} -> + ok end. |