diff options
author | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:35:04 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:35:04 +0100 |
commit | 252b055e7f05e2beb91d680635dec9a9b307b1b1 (patch) | |
tree | f9055b368bcc947ca331725d17ed153173317e11 /lib/kernel/src/inet.erl | |
parent | 6dc3f61a6e2a635de31c2016e7bd8e6ff16533af (diff) | |
parent | 68ba8d70deb1549dd37a8325eea686c9908f926b (diff) | |
download | otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.tar.gz otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.tar.bz2 otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.zip |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'lib/kernel/src/inet.erl')
-rw-r--r-- | lib/kernel/src/inet.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index 49f64a9236..4de3c1c6b1 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -1218,11 +1218,13 @@ port_list(Name) -> %% utils %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec format_error(Posix) -> string() when - Posix :: posix(). +-spec format_error(Reason) -> string() when + Reason :: posix() | system_limit. format_error(exbadport) -> "invalid port state"; format_error(exbadseq) -> "bad command sequence"; +format_error(system_limit) -> + "a system limit was hit, probably not enough ports"; format_error(Tag) -> erl_posix_msg:message(Tag). |