diff options
author | Sverker Eriksson <sverker@erlang.org> | 2011-03-01 16:47:09 +0100 |
---|---|---|
committer | Sverker Eriksson <sverker@erlang.org> | 2011-03-01 17:01:22 +0100 |
commit | 435a89b9d156f3f6d88416dedb8e75b0489eba80 (patch) | |
tree | d8a7c01380bc08827c8895b6dbe679ca304c7147 /erts | |
parent | 98d3b0c86ff3d99a4d175291df54c5ed48357fce (diff) | |
download | otp-435a89b9d156f3f6d88416dedb8e75b0489eba80.tar.gz otp-435a89b9d156f3f6d88416dedb8e75b0489eba80.tar.bz2 otp-435a89b9d156f3f6d88416dedb8e75b0489eba80.zip |
Fix three dialyzer warnings in kernel
Joint effort by Kostis, pan, egil & sverker
Diffstat (limited to 'erts')
-rw-r--r-- | erts/preloaded/src/erlang.erl | 16 | ||||
-rw-r--r-- | erts/preloaded/src/prim_inet.erl | 4 |
2 files changed, 7 insertions, 13 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 935c2de253..d6dc070436 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -427,17 +427,11 @@ delay_trap(Result, Timeout) -> receive after Timeout -> Result end. %% have to reflect that, which we cannot forsee. %% set_cookie(Node, C) when Node =/= nonode@nohost, is_atom(Node) -> - Res = case C of - _ when is_atom(C) -> - auth:set_cookie(Node, C); - {CI,CO} when is_atom(CI), is_atom(CO) -> - auth:set_cookie(Node, {CI, CO}); - _ -> - error - end, - case Res of - error -> exit(badarg); - Other -> Other + case is_atom(C) of + true -> + auth:set_cookie(Node, C); + false -> + error(badarg) end. -spec get_cookie() -> atom(). diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl index 446656e45f..2e4a2866e6 100644 --- a/erts/preloaded/src/prim_inet.erl +++ b/erts/preloaded/src/prim_inet.erl @@ -1518,7 +1518,7 @@ enc_value_2(addr, {IP,Port}) when tuple_size(IP) =:= 4 -> [?INET_AF_INET,?int16(Port)|ip4_to_bytes(IP)]; enc_value_2(addr, {IP,Port}) when tuple_size(IP) =:= 8 -> [?INET_AF_INET6,?int16(Port)|ip6_to_bytes(IP)]; -enc_value_2(ether, [X1,X2,X3,X4,X5,X6]) -> [X1,X2,X3,X4,X5,X6]; +enc_value_2(ether, [_,_,_,_,_,_]=Xs) -> Xs; enc_value_2(sockaddr, any) -> [?INET_AF_ANY]; enc_value_2(sockaddr, loopback) -> @@ -1572,7 +1572,7 @@ dec_value(time, [X3,X2,X1,X0|T]) -> Val -> {Val, T} end; dec_value(ip, [A,B,C,D|T]) -> {{A,B,C,D}, T}; -dec_value(ether,[X1,X2,X3,X4,X5,X6|T]) -> {[X1,X2,X3,X4,X5,X6],T}; +%% dec_value(ether, [X1,X2,X3,X4,X5,X6|T]) -> {[X1,X2,X3,X4,X5,X6],T}; dec_value(sockaddr, [X|T]) -> get_ip(X, T); dec_value(linkaddr, [X1,X0|T]) -> |