diff options
| author | Sverker Eriksson <[email protected]> | 2011-03-03 12:47:02 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-03-03 12:47:02 +0100 |
| commit | 45892fd845b74532a6cae750372b6e80eb8e3ad9 (patch) | |
| tree | 2c27332986f6803a6ef97072b0e8e70265b1fa59 /erts/preloaded/src/prim_inet.erl | |
| parent | e38a935df26ca0f37fa17c6df771430de18f9043 (diff) | |
| parent | be3218dc1bf7dec1217bcac82492a5550da7ee17 (diff) | |
| download | otp-45892fd845b74532a6cae750372b6e80eb8e3ad9.tar.gz otp-45892fd845b74532a6cae750372b6e80eb8e3ad9.tar.bz2 otp-45892fd845b74532a6cae750372b6e80eb8e3ad9.zip | |
Merge branch 'sverker/dialyzer_kernel_fixes' into dev
* sverker/dialyzer_kernel_fixes:
Fix dialyzer warning in os:start_port_srv_loop
Update preloaded modules
Fix three dialyzer warnings in kernel
Diffstat (limited to 'erts/preloaded/src/prim_inet.erl')
| -rw-r--r-- | erts/preloaded/src/prim_inet.erl | 4 |
1 files changed, 2 insertions, 2 deletions
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]) -> |