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/doc | |
| 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/doc')
| -rw-r--r-- | lib/kernel/doc/src/gen_tcp.xml | 6 | ||||
| -rw-r--r-- | lib/kernel/doc/src/gen_udp.xml | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml index 08454b9832..e97db20062 100644 --- a/lib/kernel/doc/src/gen_tcp.xml +++ b/lib/kernel/doc/src/gen_tcp.xml @@ -231,7 +231,11 @@ do_recv(Sock, Bs) -> <c><anno>Socket</anno></c>. The controlling process is the process that receives messages from the socket. If called by any other process than the current controlling process, - <c>{error, not_owner}</c> is returned.</p> + <c>{error, not_owner}</c> is returned. If the process identified + by <c><anno>Pid</anno></c> is not an existing local pid, + <c>{error, badarg}</c> is returned. <c>{error, badarg}</c> may also + be returned in some cases when <c><anno>Socket</anno></c> is closed + during the execution of this function.</p> <p>If the socket is set in active mode, this function will transfer any messages in the mailbox of the caller to the new controlling process. diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml index 3f88a0272d..f79566ef71 100644 --- a/lib/kernel/doc/src/gen_udp.xml +++ b/lib/kernel/doc/src/gen_udp.xml @@ -68,7 +68,11 @@ <c><anno>Socket</anno></c>. The controlling process is the process that receives messages from the socket. If called by any other process than the current controlling process, - <c>{error, not_owner}</c> is returned.</p> + <c>{error, not_owner}</c> is returned. If the process identified + by <c><anno>Pid</anno></c> is not an existing local pid, + <c>{error, badarg}</c> is returned. <c>{error, badarg}</c> may also + be returned in some cases when <c><anno>Socket</anno></c> is closed + during the execution of this function.</p> </desc> </func> |