diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-05-03 10:59:31 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-05-03 10:59:31 +0200 |
| commit | 6f03c25ec03a743c1e707b70839973a05b431095 (patch) | |
| tree | 169a51216ef6b896e805d74f7b02efc3b36c76a1 | |
| parent | 8d74122d8ee9eb46bfb49c13ec39f515996a58a2 (diff) | |
| parent | 995daeae6917c1369ef4ea7a620c9488c4059456 (diff) | |
| download | otp-6f03c25ec03a743c1e707b70839973a05b431095.tar.gz otp-6f03c25ec03a743c1e707b70839973a05b431095.tar.bz2 otp-6f03c25ec03a743c1e707b70839973a05b431095.zip | |
Merge branch 'ia/ssl/dialyzer-iodata' into dev
* ia/ssl/dialyzer-iodata:
Changed iolist() to iodata()
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 60ea4d547f..f3164cdb46 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -583,7 +583,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} | <fsummary>Write data to a socket.</fsummary> <type> <v>Socket = sslsocket()</v> - <v>Data = iolist() | binary()</v> + <v>Data = iodata()</v> </type> <desc> <p>Writes <c>Data</c> to <c>Socket</c>. </p> diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 7b1fda4cf9..ae0f8477fc 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -264,7 +264,7 @@ close(Socket = #sslsocket{}) -> ssl_broker:close(Socket). %%-------------------------------------------------------------------- --spec send(#sslsocket{}, iolist()) -> ok | {error, reason()}. +-spec send(#sslsocket{}, iodata()) -> ok | {error, reason()}. %% %% Description: Sends data over the ssl connection %%-------------------------------------------------------------------- diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 574e1e9468..0a86e9bd29 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -107,12 +107,14 @@ %%==================================================================== %%-------------------------------------------------------------------- --spec send(pid(), iolist()) -> ok | {error, reason()}. +-spec send(pid(), iodata()) -> ok | {error, reason()}. %% %% Description: Sends data over the ssl connection %%-------------------------------------------------------------------- send(Pid, Data) -> sync_send_all_state_event(Pid, {application_data, + %% iolist_to_binary should really + %% be called iodata_to_binary() erlang:iolist_to_binary(Data)}, infinity). %%-------------------------------------------------------------------- |