cosmetic changes

5 files changed, 22 insertions, 14 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index a45b927bcf..9ab6b1a68c 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -128,9 +128,9 @@ start(normal, []) ->
               io:format("starting ~-20s ...", [Msg]),
               Thunk(),
               io:format("done~n");
-      ({Msg, M, F, A}) ->
+          ({Msg, M, F, A}) ->
               io:format("starting ~-20s ...", [Msg]),
-          apply(M, F, A),
+              apply(M, F, A),
               io:format("done~n")
       end,
       [{"database",
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 9bc965148b..4342e15b3b 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -173,8 +173,14 @@ add_vhost(VHostPath) ->
                   case mnesia:read({vhost, VHostPath}) of
                       [] ->
                           ok = mnesia:write(#vhost{virtual_host = VHostPath}),
-                          [ rabbit_exchange:declare(rabbit_misc:r(VHostPath, exchange, Name), Type, true, false, []) || {Name,Type}
-                            <- [{<<"">>, direct}, { <<"amq.direct">>, direct}, {<<"amq.topic">>, topic}, {<<"amq.fanout">>, fanout}]],
+                          [rabbit_exchange:declare(
+                             rabbit_misc:r(VHostPath, exchange, Name),
+                             Type, true, false, []) ||
+                              {Name,Type} <-
+                                  [{<<"">>,           direct},
+                                   {<<"amq.direct">>, direct},
+                                   {<<"amq.topic">>,  topic},
+                                   {<<"amq.fanout">>, fanout}]],
                           ok;
                       [_] ->
                           mnesia:abort({vhost_already_exists, VHostPath})
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 1be24761b5..7ce350d86e 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -130,7 +130,7 @@ recover_durable_queues() ->
               ok
       end).
 
-declare(QueueName = #resource{}, Durable, AutoDelete, Args) ->
+declare(QueueName, Durable, AutoDelete, Args) ->
     Q = start_queue_process(#amqqueue{name = QueueName,
                                       durable = Durable,
                                       auto_delete = AutoDelete,
@@ -360,8 +360,8 @@ on_node_down(Node) ->
                             node(Pid) == Node]))
       end).
 
-pseudo_queue(Resource = #resource{}, Pid) ->
-    #amqqueue{name = Resource,
+pseudo_queue(QueueName, Pid) ->
+    #amqqueue{name = QueueName,
               durable = false,
               auto_delete = false,
               arguments = [],
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 15e2879b57..caa63b58f1 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -532,7 +532,8 @@ handle_method(#'queue.declare'{queue = QueueNameBin,
                         Other -> check_name('queue', Other)
                     end,
 		QueueName = rabbit_misc:r(VHostPath, queue, ActualNameBin),
-                Finish(rabbit_amqqueue:declare(QueueName, Durable, AutoDelete, Args));
+                Finish(rabbit_amqqueue:declare(QueueName,
+                                               Durable, AutoDelete, Args));
             Other -> Other
         end,
     return_queue_declare_ok(State, NoWait, Q);
@@ -549,7 +550,8 @@ handle_method(#'queue.delete'{queue = QueueNameBin,
                               if_unused = IfUnused,
                               if_empty = IfEmpty,
                               nowait = NoWait
-                             },_, State) ->
+                             },
+              _, State) ->
     QueueName = expand_queue_name_shortcut(QueueNameBin, State),
     case rabbit_amqqueue:with_or_die(
            QueueName,
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index cd5511aa6a..bb132a5048 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -90,7 +90,7 @@ recover_durable_exchanges() ->
                            end, ok, durable_exchanges)
       end).
 
-declare(ExchangeName = #resource{}, Type, Durable, AutoDelete, Args) ->
+declare(ExchangeName, Type, Durable, AutoDelete, Args) ->
     Exchange = #exchange{name = ExchangeName,
                          type = Type,
                          durable = Durable,
@@ -145,10 +145,10 @@ list_vhost_exchanges(VHostPath) ->
 
 list_exchange_bindings(Name) ->
     [{QueueName, RoutingKey, Arguments} ||
-    #binding{handlers = Handlers} <- bindings_for_exchange(Name),
-    #handler{binding_spec = #binding_spec{routing_key = RoutingKey,
-                          arguments = Arguments},
-         queue = QueueName} <- Handlers].
+        #binding{handlers = Handlers} <- bindings_for_exchange(Name),
+        #handler{binding_spec = #binding_spec{routing_key = RoutingKey,
+                                              arguments = Arguments},
+                 queue = QueueName} <- Handlers].
 
 bindings_for_exchange(Name) ->
     qlc:e(qlc:q([B || B = #binding{key = K} <- mnesia:table(binding),