diff options
author | Micael Karlberg <[email protected]> | 2018-06-12 15:47:29 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2018-09-18 14:50:18 +0200 |
commit | ef34944c970f842a7406f59c827243c8be77fdc2 (patch) | |
tree | 6b0f6954559cbffffada3e076b93267f79181b70 /erts/preloaded | |
parent | d892681a4554b08442db219c3ac161027e9a4c4f (diff) | |
download | otp-ef34944c970f842a7406f59c827243c8be77fdc2.tar.gz otp-ef34944c970f842a7406f59c827243c8be77fdc2.tar.bz2 otp-ef34944c970f842a7406f59c827243c8be77fdc2.zip |
[net-nif] Fixed getnameinfo
And now fixed the getnameinfo function.
OTP-14831
Diffstat (limited to 'erts/preloaded')
-rw-r--r-- | erts/preloaded/ebin/net.beam | bin | 5892 -> 5980 bytes | |||
-rw-r--r-- | erts/preloaded/src/net.erl | 8 |
2 files changed, 5 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/net.beam b/erts/preloaded/ebin/net.beam Binary files differindex c83cafe209..66391317a2 100644 --- a/erts/preloaded/ebin/net.beam +++ b/erts/preloaded/ebin/net.beam diff --git a/erts/preloaded/src/net.erl b/erts/preloaded/src/net.erl index 823f11e2b8..29739f4510 100644 --- a/erts/preloaded/src/net.erl +++ b/erts/preloaded/src/net.erl @@ -206,18 +206,20 @@ gethostname() -> getnameinfo(SockAddr) when is_record(SockAddr, in4_sockaddr) orelse is_record(SockAddr, in6_sockaddr) -> - getnameinfo(SockAddr, []). + getnameinfo(SockAddr, undefined). -spec getnameinfo(SockAddr, Flags) -> {ok, Info} | {error, Reason} when SockAddr :: in_sockaddr(), - Flags :: name_info_flags(), + Flags :: name_info_flags() | undefined, Info :: name_info(), Reason :: term(). +getnameinfo(SockAddr, [] = _Flags) -> + getnameinfo(SockAddr, undefined); getnameinfo(SockAddr, Flags) when (is_record(SockAddr, in4_sockaddr) orelse is_record(SockAddr, in6_sockaddr)) andalso - is_list(Flags) -> + (is_list(Flags) orelse (Flags =:= undefined)) -> nif_getnameinfo(SockAddr, Flags). |