diff options
| author | Raimo Niskanen <[email protected]> | 2016-11-09 08:37:30 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-11-09 08:37:30 +0100 |
| commit | 99bb976389c8971b755f103a67143815a6b3e388 (patch) | |
| tree | 9c05ea209152e107de7065ac32ee2ab700413aba /lib/kernel/src | |
| parent | 89822dcdd805c9a7bfd68349901d594ee64f7605 (diff) | |
| parent | 992c594106ca23cd4120249cd904f6ffa7bdd13e (diff) | |
| download | otp-99bb976389c8971b755f103a67143815a6b3e388.tar.gz otp-99bb976389c8971b755f103a67143815a6b3e388.tar.bz2 otp-99bb976389c8971b755f103a67143815a6b3e388.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/gen_sctp.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/gen_udp.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl index b133e6fed4..a6aa0edd15 100644 --- a/lib/kernel/src/gen_sctp.erl +++ b/lib/kernel/src/gen_sctp.erl @@ -439,7 +439,7 @@ error_string(X) -> -spec controlling_process(Socket, Pid) -> ok | {error, Reason} when Socket :: sctp_socket(), Pid :: pid(), - Reason :: closed | not_owner | inet:posix(). + Reason :: closed | not_owner | badarg | inet:posix(). controlling_process(S, Pid) when is_port(S), is_pid(Pid) -> inet:udp_controlling_process(S, Pid); diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index 1a21541b7c..ac61dbc792 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -320,7 +320,7 @@ unrecv(S, Data) when is_port(S) -> -spec controlling_process(Socket, Pid) -> ok | {error, Reason} when Socket :: socket(), Pid :: pid(), - Reason :: closed | not_owner | inet:posix(). + Reason :: closed | not_owner | badarg | inet:posix(). controlling_process(S, NewOwner) -> case inet_db:lookup_socket(S) of diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl index 98d2f0bcfb..3121544719 100644 --- a/lib/kernel/src/gen_udp.erl +++ b/lib/kernel/src/gen_udp.erl @@ -195,7 +195,7 @@ connect(S, Address, Port) when is_port(S) -> -spec controlling_process(Socket, Pid) -> ok | {error, Reason} when Socket :: socket(), Pid :: pid(), - Reason :: closed | not_owner | inet:posix(). + Reason :: closed | not_owner | badarg | inet:posix(). controlling_process(S, NewOwner) -> inet:udp_controlling_process(S, NewOwner). |