From 1cc1ac6dc8c43a7d6fc6e36abb80cecd3a74414c Mon Sep 17 00:00:00 2001
From: Vlad Alexandru Ionescu <vlad@rabbitmq.com>
Date: Thu, 20 Jan 2011 17:19:07 +0000
Subject: fixing type specs; other cosmetic

---
 src/rabbit_channel_sup.erl | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/rabbit_channel_sup.erl')

diff --git a/src/rabbit_channel_sup.erl b/src/rabbit_channel_sup.erl
index 3b00181b..d21cfdb7 100644
--- a/src/rabbit_channel_sup.erl
+++ b/src/rabbit_channel_sup.erl
@@ -18,7 +18,7 @@
 
 -behaviour(supervisor2).
 
--export([start_link/2]).
+-export([start_link/1]).
 
 -export([init/1]).
 
@@ -31,19 +31,20 @@
 -export_type([start_link_args/0]).
 
 -type(start_link_args() ::
-        {rabbit_types:protocol(), rabbit_net:socket(),
+        {'tcp', rabbit_types:protocol(), rabbit_net:socket(),
          rabbit_channel:channel_number(), non_neg_integer(), pid(),
-         rabbit_types:user(), rabbit_types:vhost(), pid()}).
+         rabbit_types:user(), rabbit_types:vhost(), pid()} |
+        {'direct', rabbit_channel:channel_number(), pid(), rabbit_types:user(),
+         rabbit_types:vhost(), pid()}).
 
--spec(start_link/2 :: (atom(), start_link_args()) ->
-                          {'ok', pid(), {pid(), any()}}).
+-spec(start_link/1 :: (start_link_args()) -> {'ok', pid(), {pid(), any()}}).
 
 -endif.
 
 %%----------------------------------------------------------------------------
 
-start_link(tcp, {Protocol, Sock, Channel, FrameMax, ReaderPid, User, VHost,
-                 Collector}) ->
+start_link({tcp, Protocol, Sock, Channel, FrameMax, ReaderPid, User, VHost,
+            Collector}) ->
     {ok, SupPid} = supervisor2:start_link(?MODULE, []),
     {ok, WriterPid} =
         supervisor2:start_child(
@@ -60,7 +61,7 @@ start_link(tcp, {Protocol, Sock, Channel, FrameMax, ReaderPid, User, VHost,
            intrinsic, ?MAX_WAIT, worker, [rabbit_channel]}),
     {ok, AState} = rabbit_command_assembler:init(Protocol),
     {ok, SupPid, {ChannelPid, AState}};
-start_link(direct, {Channel, ClientChannelPid, User, VHost, Collector}) ->
+start_link({direct, Channel, ClientChannelPid, User, VHost, Collector}) ->
     {ok, SupPid} = supervisor2:start_link(?MODULE, []),
     {ok, ChannelPid} =
         supervisor2:start_child(
-- 
cgit v1.2.1