diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-05 10:45:36 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-05 10:45:36 +0200 |
| commit | 7db84033da5880f2e3501865749a8c166fe2d358 (patch) | |
| tree | d15699586cd14c5dabbe2354bb9e5fa68ce0850c /lib/ssl/src/ssl.erl | |
| parent | 6a113a60dba9fd6c4d736b9e56c52f3494a15027 (diff) | |
| parent | eff93daf5f3f8d917414b89335ab4c8af5afe686 (diff) | |
| download | otp-7db84033da5880f2e3501865749a8c166fe2d358.tar.gz otp-7db84033da5880f2e3501865749a8c166fe2d358.tar.bz2 otp-7db84033da5880f2e3501865749a8c166fe2d358.zip | |
Merge branch 'ia/ssl/inet-spec-corrections' into dev
* ia/ssl/inet-spec-corrections:
Corrected spec name errors: ip_adress -> ip_address port_num -> port_number
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 74900936a3..6074dab3ca 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -99,11 +99,11 @@ stop() -> application:stop(ssl). %%-------------------------------------------------------------------- --spec connect(host() | inet:port_num(), [connect_option()]) -> {ok, #sslsocket{}} | +-spec connect(host() | inet:port_number(), [connect_option()]) -> {ok, #sslsocket{}} | {error, reason()}. --spec connect(host() | inet:port_num(), [connect_option()] | inet:port_num(), timeout() | list()) -> +-spec connect(host() | inet:port_number(), [connect_option()] | inet:port_number(), timeout() | list()) -> {ok, #sslsocket{}} | {error, reason()}. --spec connect(host() | inet:port_num(), inet:port_num(), list(), timeout()) -> +-spec connect(host() | inet:port_number(), inet:port_number(), list(), timeout()) -> {ok, #sslsocket{}} | {error, reason()}. %% @@ -151,7 +151,7 @@ connect(Host, Port, Options0, Timeout) -> end. %%-------------------------------------------------------------------- --spec listen(inet:port_num(), [listen_option()]) ->{ok, #sslsocket{}} | {error, reason()}. +-spec listen(inet:port_number(), [listen_option()]) ->{ok, #sslsocket{}} | {error, reason()}. %% %% Description: Creates an ssl listen socket. @@ -376,7 +376,7 @@ select_part(plain, Cert, Opts) -> end. %%-------------------------------------------------------------------- --spec peername(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_num()}} | {error, reason()}. +-spec peername(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}. %% %% Description: same as inet:peername/1. %%-------------------------------------------------------------------- @@ -470,7 +470,7 @@ shutdown(#sslsocket{pid = Pid, fd = new_ssl}, How) -> ssl_connection:shutdown(Pid, How). %%-------------------------------------------------------------------- --spec sockname(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_num()}} | {error, reason()}. +-spec sockname(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}. %% %% Description: Same as inet:sockname/1 %%-------------------------------------------------------------------- |