diff options
| author | Micael Karlberg <[email protected]> | 2019-02-22 19:14:41 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-02-22 19:14:41 +0100 |
| commit | 9f324bf871ff2fd1bb8c7adbbfc47b22b0419a5d (patch) | |
| tree | e2e4139e6e0318e910b8ff827bfcda17f3794cff /lib | |
| parent | 4cb28a71019ac8208bd642144c5a525700d8fb0e (diff) | |
| parent | 45f277dcff0bab3b90e39e4b24ffc1f5bb6c3f3e (diff) | |
| download | otp-9f324bf871ff2fd1bb8c7adbbfc47b22b0419a5d.tar.gz otp-9f324bf871ff2fd1bb8c7adbbfc47b22b0419a5d.tar.bz2 otp-9f324bf871ff2fd1bb8c7adbbfc47b22b0419a5d.zip | |
Merge pull request #2138 from wojtekmach/wm-socks
gen_tcp, gen_udp: Update specs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 6 | ||||
| -rw-r--r-- | lib/kernel/src/gen_udp.erl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index 7f7833ec23..5d4764f8ff 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -156,7 +156,7 @@ connect(Address, Port, Opts) -> Options :: [connect_option()], Timeout :: timeout(), Socket :: socket(), - Reason :: inet:posix(). + Reason :: timeout | inet:posix(). connect(Address, Port, Opts, Time) -> Timer = inet:start_timer(Time), @@ -220,7 +220,7 @@ listen(Port, Opts0) -> -spec accept(ListenSocket) -> {ok, Socket} | {error, Reason} when ListenSocket :: socket(), Socket :: socket(), - Reason :: closed | timeout | system_limit | inet:posix(). + Reason :: closed | system_limit | inet:posix(). accept(S) -> case inet_db:lookup_socket(S) of @@ -312,7 +312,7 @@ recv(S, Length) when is_port(S) -> Length :: non_neg_integer(), Timeout :: timeout(), Packet :: string() | binary() | HttpPacket, - Reason :: closed | inet:posix(), + Reason :: closed | timeout | inet:posix(), HttpPacket :: term(). recv(S, Length, Time) when is_port(S) -> diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl index d6e8652e77..fad7b2f887 100644 --- a/lib/kernel/src/gen_udp.erl +++ b/lib/kernel/src/gen_udp.erl @@ -95,7 +95,7 @@ -spec open(Port) -> {ok, Socket} | {error, Reason} when Port :: inet:port_number(), Socket :: socket(), - Reason :: inet:posix(). + Reason :: system_limit | inet:posix(). open(Port) -> open(Port, []). @@ -112,7 +112,7 @@ open(Port) -> | {bind_to_device, binary()} | option(), Socket :: socket(), - Reason :: inet:posix(). + Reason :: system_limit | inet:posix(). open(Port, Opts0) -> {Mod, Opts} = inet:udp_module(Opts0), @@ -186,7 +186,7 @@ recv(S,Len) when is_port(S), is_integer(Len) -> Port :: inet:port_number(), AncData :: inet:ancillary_data(), Packet :: string() | binary(), - Reason :: not_owner | inet:posix(). + Reason :: not_owner | timeout | inet:posix(). recv(S,Len,Time) when is_port(S) -> case inet_db:lookup_socket(S) of |