diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-08 20:44:20 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-08 20:44:20 +0100 |
| commit | adeabcee97ab51a2becd3d94118f2915851bcfa6 (patch) | |
| tree | 2c0ff17b7ade49511f631c9796bf668fb9d1378e | |
| parent | f5bd73d2cee785e03ceda2833b0a8b9006cacf6d (diff) | |
| download | rabbitmq-server-git-adeabcee97ab51a2becd3d94118f2915851bcfa6.tar.gz | |
fix type sigs
| -rw-r--r-- | src/rabbit_net.erl | 22 | ||||
| -rw-r--r-- | src/rabbit_ssl.erl | 15 |
2 files changed, 16 insertions, 21 deletions
diff --git a/src/rabbit_net.erl b/src/rabbit_net.erl index e9f72ed0e9..59f272ec50 100644 --- a/src/rabbit_net.erl +++ b/src/rabbit_net.erl @@ -45,31 +45,29 @@ -type(stat_option() :: 'recv_cnt' | 'recv_max' | 'recv_avg' | 'recv_oct' | 'recv_dvi' | 'send_cnt' | 'send_max' | 'send_avg' | 'send_oct' | 'send_pend'). --type(error() :: rabbit_types:error(any())). +-type(ok_val_or_error(A) :: rabbit_types:ok_or_error2(A, any())). +-type(ok_or_any_error() :: rabbit_types:ok_or_error(any())). -type(socket() :: rabbit_networking:ip_port() | rabbit_types:ssl_socket()). -spec(async_recv/3 :: (socket(), integer(), timeout()) -> rabbit_types:ok(any())). --spec(close/1 :: (socket()) -> rabbit_types:ok_or_error(any())). --spec(controlling_process/2 :: - (socket(), pid()) -> rabbit_types:ok_or_error(any())). +-spec(close/1 :: (socket()) -> ok_or_any_error()). +-spec(controlling_process/2 :: (socket(), pid()) -> ok_or_any_error()). -spec(port_command/2 :: (socket(), iolist()) -> 'true'). -spec(send/2 :: - (socket(), binary() | iolist()) -> rabbit_types:ok_or_error(any())). + (socket(), binary() | iolist()) -> ok_or_any_error()). -spec(peername/1 :: (socket()) - -> rabbit_types:ok({inet:ip_address(), rabbit_networking:ip_port()}) | - error()). + -> ok_val_or_error({inet:ip_address(), rabbit_networking:ip_port()})). -spec(peercert/1 :: - (socket() | rabbit_types:ssl_socket()) - -> rabbit_types:ok_or_error(no_ssl | rabbit_ssl:certificate())). + (socket()) + -> 'nossl' | ok_val_or_error(rabbit_ssl:certificate())). -spec(sockname/1 :: (socket()) - -> rabbit_types:ok({inet:ip_address(), rabbit_networking:ip_port()}) | - error()). + -> ok_val_or_error({inet:ip_address(), rabbit_networking:ip_port()})). -spec(getstat/2 :: (socket(), [stat_option()]) - -> rabbit_types:ok([{stat_option(), integer()}]) | error()). + -> ok_val_or_error([{stat_option(), integer()}])). -endif. diff --git a/src/rabbit_ssl.erl b/src/rabbit_ssl.erl index 2c9d5ecab2..f7da832519 100644 --- a/src/rabbit_ssl.erl +++ b/src/rabbit_ssl.erl @@ -38,22 +38,19 @@ -export([peer_cert_issuer/1, peer_cert_subject/1, peer_cert_validity/1]). --export_type([certificate/0, ssl_socket/0]). - %%-------------------------------------------------------------------------- -ifdef(use_specs). --type(ssl_socket() :: #ssl_socket{}). --type(certificate() :: #'OTPCertificate'{}). --type(a_socket() :: rabbit_networking:socket() | ssl_socket()). +-export_type([certificate/0]). --spec(peer_cert_issuer/1 :: (a_socket()) -> string()). --spec(peer_cert_subject/1 :: (a_socket()) -> string()). --spec(peer_cert_validity/1 :: (a_socket()) -> string()). +-type(certificate() :: #'OTPCertificate'{}). --endif. %% use_specs +-spec(peer_cert_issuer/1 :: (rabbit_net:socket()) -> string()). +-spec(peer_cert_subject/1 :: (rabbit_net:socket()) -> string()). +-spec(peer_cert_validity/1 :: (rabbit_net:socket()) -> string()). +-endif. %%-------------------------------------------------------------------------- %% High-level functions used by reader |