From 3e55cb62c9053895412b1cf2a65d54ef90eda34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 25 May 2011 23:02:40 +0200 Subject: Refresh the type specifications. Following discussions on #erlounge. Also fixes compilation in R14B03 and fixes a few underspecs dialyzer warnings. --- src/cowboy_tcp_transport.erl | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'src/cowboy_tcp_transport.erl') diff --git a/src/cowboy_tcp_transport.erl b/src/cowboy_tcp_transport.erl index fdd3ca6..cf00bbc 100644 --- a/src/cowboy_tcp_transport.erl +++ b/src/cowboy_tcp_transport.erl @@ -16,8 +16,6 @@ -export([name/0, messages/0, listen/1, accept/2, recv/3, send/2, setopts/2, controlling_process/2, peername/1, close/1]). %% API. --include_lib("kernel/include/inet.hrl"). - %% API. -spec name() -> tcp. @@ -26,45 +24,41 @@ name() -> tcp. -spec messages() -> {tcp, tcp_closed, tcp_error}. messages() -> {tcp, tcp_closed, tcp_error}. --spec listen([{port, Port::ip_port()}]) - -> {ok, LSocket::inet:socket()} | {error, Reason::atom()}. +-spec listen([{port, inet:ip_port()}]) -> {ok, inet:socket()} | {error, atom()}. listen(Opts) -> {port, Port} = lists:keyfind(port, 1, Opts), Backlog = proplists:get_value(backlog, Opts, 1024), gen_tcp:listen(Port, [binary, {active, false}, {backlog, Backlog}, {packet, raw}, {reuseaddr, true}]). --spec accept(LSocket::inet:socket(), Timeout::timeout()) - -> {ok, Socket::inet:socket()} - | {error, Reason::closed | timeout | atom()}. +-spec accept(inet:socket(), timeout()) + -> {ok, inet:socket()} | {error, closed | timeout | atom()}. accept(LSocket, Timeout) -> gen_tcp:accept(LSocket, Timeout). --spec recv(Socket::inet:socket(), Length::integer(), Timeout::timeout()) - -> {ok, Packet::term()} | {error, Reason::closed | atom()}. +-spec recv(inet:socket(), non_neg_integer(), timeout()) + -> {ok, any()} | {error, closed | atom()}. recv(Socket, Length, Timeout) -> gen_tcp:recv(Socket, Length, Timeout). --spec send(Socket::inet:socket(), Packet::iolist()) - -> ok | {error, Reason::atom()}. +-spec send(inet:socket(), iolist()) -> ok | {error, atom()}. send(Socket, Packet) -> gen_tcp:send(Socket, Packet). --spec setopts(Socket::inet:socket(), Opts::list(term())) - -> ok | {error, Reason::atom()}. +-spec setopts(inet:socket(), list()) -> ok | {error, atom()}. setopts(Socket, Opts) -> inet:setopts(Socket, Opts). --spec controlling_process(Socket::inet:socket(), Pid::pid()) - -> ok | {error, Reason::closed | not_owner | atom()}. +-spec controlling_process(inet:socket(), pid()) + -> ok | {error, closed | not_owner | atom()}. controlling_process(Socket, Pid) -> gen_tcp:controlling_process(Socket, Pid). --spec peername(Socket::inet:socket()) - -> {ok, {Address::ip_address(), Port::ip_port()}} | {error, atom()}. +-spec peername(inet:socket()) + -> {ok, {inet:ip_address(), inet:ip_port()}} | {error, atom()}. peername(Socket) -> inet:peername(Socket). --spec close(Socket::inet:socket()) -> ok. +-spec close(inet:socket()) -> ok. close(Socket) -> gen_tcp:close(Socket). -- cgit v1.2.3