Cosmetics only - line length, consistent whitespace, and a couple of if -> case conversions

8 files changed, 78 insertions, 59 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index c1ffff5a..2c338516 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -325,8 +325,9 @@ internal_delete(QueueName) ->
                       [_] ->
                           ok = mnesia:delete({rabbit_queue, QueueName}),
                           ok = mnesia:delete({rabbit_durable_queue, QueueName}),
-                          %% we want to execute some things,
-                          %% as decided by rabbit_exchange, after the transaction.
+                          %% we want to execute some things, as
+                          %% decided by rabbit_exchange, after the
+                          %% transaction.
                           rabbit_exchange:delete_queue_bindings(QueueName)
                   end
           end) of
@@ -343,15 +344,16 @@ on_node_down(Node) ->
               fun () ->
                       qlc:fold(
                         fun (QueueName, Acc) ->
-                                Post = rabbit_exchange:delete_transient_queue_bindings(
-                                         QueueName),
+                                Post = rabbit_exchange:
+                                    delete_transient_queue_bindings(QueueName),
                                 ok = mnesia:delete({rabbit_queue, QueueName}),
                                 [Post | Acc]
                         end,
                         [],
-                        qlc:q([QueueName || #amqqueue{name = QueueName, pid = Pid}
-                                                <- mnesia:table(rabbit_queue),
-                                            node(Pid) == Node]))
+                        qlc:q([QueueName ||
+                                  #amqqueue{name = QueueName, pid = Pid}
+                                      <- mnesia:table(rabbit_queue),
+                                  node(Pid) == Node]))
               end)],
     ok.
 
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 537bcd68..0734c083 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -96,12 +96,12 @@
 
 recover() ->
     Exs = rabbit_misc:table_fold(
-            fun(Exchange, Acc) -> ok = mnesia:write(rabbit_exchange,
-                                                    Exchange, write),
-                                  [Exchange | Acc]
+            fun(Exchange, Acc) ->
+                    ok = mnesia:write(rabbit_exchange, Exchange, write),
+                    [Exchange | Acc]
             end, [], rabbit_durable_exchange),
     Bs = rabbit_misc:table_fold(
-           fun(Route = #route{ binding = B}, Acc) ->
+           fun(Route = #route{binding = B}, Acc) ->
                    {_, ReverseRoute} = route_with_reverse(Route),
                    ok = mnesia:write(rabbit_route,
                                      Route, write),
@@ -118,11 +118,10 @@ recover_with_bindings(Bs, Exs) ->
       lists:keysort(#exchange.name, Exs), []).
 
 recover_with_bindings([B = #binding{exchange_name = N} | Rest],
-                   Xs = [#exchange{ name = Name} | _],
-                   Bindings)
-  when N =:= Name ->
+                      Xs = [#exchange{name = Name} | _],
+                      Bindings) when N =:= Name ->
     recover_with_bindings(Rest, Xs, [B | Bindings]);
-recover_with_bindings(Bs, [X = #exchange{ type = Type } | Xs], Bindings) ->
+recover_with_bindings(Bs, [X = #exchange{type = Type} | Xs], Bindings) ->
     (type_to_module(Type)):recover(X, Bindings),
     recover_with_bindings(Bs, Xs, []);
 recover_with_bindings([], [], []) ->
@@ -137,18 +136,19 @@ declare(ExchangeName, Type, Durable, AutoDelete, Args) ->
     %% We want to upset things if it isn't ok; this is different from
     %% the other hooks invocations, where we tend to ignore the return
     %% value.
-    TypeModule = (type_to_module(Type)),
+    TypeModule = type_to_module(Type),
     ok = TypeModule:validate(Exchange),
     case rabbit_misc:execute_mnesia_transaction(
            fun () ->
                    case mnesia:wread({rabbit_exchange, ExchangeName}) of
                        [] ->
                            ok = mnesia:write(rabbit_exchange, Exchange, write),
-                           if Durable ->
-                                   ok = mnesia:write(rabbit_durable_exchange,
+                           ok = case Durable of
+                                    true ->
+                                        mnesia:write(rabbit_durable_exchange,
                                                      Exchange, write);
-                              true ->
-                                   ok
+                                    false ->
+                                        ok
                            end,
                            {new, Exchange};
                        [ExistingX] ->
@@ -189,9 +189,7 @@ assert_type(#exchange{ type = ActualType }, RequiredType)
 assert_type(#exchange{ name = Name, type = ActualType }, RequiredType) ->
     rabbit_misc:protocol_error(
       not_allowed, "cannot redeclare ~s of type '~s' with type '~s'",
-      [rabbit_misc:rs(Name),
-       ActualType,
-       RequiredType]).
+      [rabbit_misc:rs(Name), ActualType, RequiredType]).
 
 lookup(Name) ->
     rabbit_misc:dirty_read({rabbit_exchange, Name}).
@@ -252,7 +250,7 @@ publish(X = #exchange{type = Type}, Seen, Delivery) ->
                                            "alternate exchange for ~s "
                                            "does not exist: ~s",
                                            [rabbit_misc:rs(XName),
-                                       rabbit_misc:rs(AName)]),
+                                            rabbit_misc:rs(AName)]),
                                          R
                                  end
                     end
@@ -295,12 +293,11 @@ delete_queue_bindings(QueueName, FwdDeleteFun) ->
                     <- mnesia:match_object(
                          rabbit_reverse_route,
                          reverse_route(#route{binding = #binding{
-                                                queue_name = QueueName, 
+                                                queue_name = QueueName,
                                                 _          = '_'}}),
                          write)],
     Cleanup = cleanup_deleted_queue_bindings(
-                lists:keysort(#binding.exchange_name,
-                              DeletedBindings),
+                lists:keysort(#binding.exchange_name, DeletedBindings),
                 none, [], []),
     fun () ->
             lists:foreach(
@@ -384,7 +381,7 @@ add_binding(ExchangeName, QueueName, RoutingKey, Arguments) ->
                            {error, durability_settings_incompatible};
                       true ->
                            case mnesia:read(rabbit_route, B) of
-                               [] -> 
+                               [] ->
                                    sync_binding(B, Q#amqqueue.durable,
                                                 fun mnesia:write/3),
                                    {new, X, B};
@@ -492,12 +489,12 @@ reverse_binding(#binding{exchange_name = Exchange,
                      args          = Args}.
 
 delete(ExchangeName, IfUnused) ->
-    Fun = if
-              IfUnused -> fun conditional_delete/1;
-              true     -> fun unconditional_delete/1
+    Fun = case IfUnused of
+              true  -> fun conditional_delete/1;
+              false -> fun unconditional_delete/1
           end,
     case call_with_exchange(ExchangeName, Fun) of
-        {deleted, X = #exchange{ type = Type }, Bs} ->
+        {deleted, X = #exchange{type = Type}, Bs} ->
             (type_to_module(Type)):delete(X, Bs),
             ok;
         Error = {error, _InUseOrNotFound} ->
@@ -519,8 +516,8 @@ conditional_delete(Exchange = #exchange{name = ExchangeName}) ->
     %% result of a node failure
     case contains(rabbit_route, Match) orelse
          contains(rabbit_durable_route, Match) of
-        false  -> unconditional_delete(Exchange);
-        true   -> {error, in_use}
+        true   -> {error, in_use};
+        false  -> unconditional_delete(Exchange)
     end.
 
 unconditional_delete(Exchange = #exchange{name = ExchangeName}) ->
diff --git a/src/rabbit_exchange_type.erl b/src/rabbit_exchange_type.erl
index 3ebb227d..deb01c3d 100644
--- a/src/rabbit_exchange_type.erl
+++ b/src/rabbit_exchange_type.erl
@@ -38,12 +38,23 @@ behaviour_info(callbacks) ->
      {description, 0},
      {publish, 2},
 
-     {validate, 1}, %% called BEFORE declaration, to check args etc; may exit with #amqp_error{}
-     {create, 1}, %% called after declaration when previously absent
-     {recover, 2}, %% called when recovering
-     {delete, 2}, %% called after exchange deletion
-     {add_binding, 2}, %% called after a binding has been added
-     {delete_binding, 2} %% called after a binding has been deleted
+     %% called BEFORE declaration, to check args etc; may exit with #amqp_error{}
+     {validate, 1},
+
+     %% called after declaration when previously absent
+     {create, 1},
+
+     %% called when recovering
+     {recover, 2},
+
+     %% called after exchange deletion
+     {delete, 2},
+
+     %% called after a binding has been added
+     {add_binding, 2},
+
+     %% called after a binding has been deleted
+     {delete_binding, 2}
     ];
 behaviour_info(_Other) ->
     undefined.
diff --git a/src/rabbit_exchange_type_direct.erl b/src/rabbit_exchange_type_direct.erl
index 68d36e7e..7526dd66 100644
--- a/src/rabbit_exchange_type_direct.erl
+++ b/src/rabbit_exchange_type_direct.erl
@@ -35,7 +35,8 @@
 -behaviour(rabbit_exchange_type).
 
 -export([description/0, publish/2]).
--export([validate/1, create/1, recover/2, delete/2, add_binding/2, delete_binding/2]).
+-export([validate/1, create/1, recover/2, delete/2, add_binding/2,
+         delete_binding/2]).
 -include("rabbit_exchange_type_spec.hrl").
 
 -rabbit_boot_step({?MODULE,
@@ -49,9 +50,10 @@ description() ->
     [{name, <<"direct">>},
      {description, <<"AMQP direct exchange, as per the AMQP specification">>}].
 
-publish(#exchange{name = Name},
-        Delivery = #delivery{message = #basic_message{routing_key = RoutingKey}}) ->
-    rabbit_router:deliver(rabbit_router:match_routing_key(Name, RoutingKey), Delivery).
+publish(#exchange{name = Name}, Delivery =
+        #delivery{message = #basic_message{routing_key = RoutingKey}}) ->
+    rabbit_router:deliver(rabbit_router:match_routing_key(Name, RoutingKey),
+                          Delivery).
 
 validate(_X) -> ok.
 create(_X) -> ok.
diff --git a/src/rabbit_exchange_type_fanout.erl b/src/rabbit_exchange_type_fanout.erl
index 60fd73d5..bef98897 100644
--- a/src/rabbit_exchange_type_fanout.erl
+++ b/src/rabbit_exchange_type_fanout.erl
@@ -35,7 +35,8 @@
 -behaviour(rabbit_exchange_type).
 
 -export([description/0, publish/2]).
--export([validate/1, create/1, recover/2, delete/2, add_binding/2, delete_binding/2]).
+-export([validate/1, create/1, recover/2, delete/2, add_binding/2,
+         delete_binding/2]).
 -include("rabbit_exchange_type_spec.hrl").
 
 -rabbit_boot_step({?MODULE,
diff --git a/src/rabbit_exchange_type_headers.erl b/src/rabbit_exchange_type_headers.erl
index 0aa2b962..760e0a6e 100644
--- a/src/rabbit_exchange_type_headers.erl
+++ b/src/rabbit_exchange_type_headers.erl
@@ -36,7 +36,8 @@
 -behaviour(rabbit_exchange_type).
 
 -export([description/0, publish/2]).
--export([validate/1, create/1, recover/2, delete/2, add_binding/2, delete_binding/2]).
+-export([validate/1, create/1, recover/2, delete/2, add_binding/2,
+         delete_binding/2]).
 -include("rabbit_exchange_type_spec.hrl").
 
 -rabbit_boot_step({?MODULE,
@@ -60,9 +61,10 @@ publish(#exchange{name = Name},
                   undefined -> [];
                   H         -> rabbit_misc:sort_field_table(H)
               end,
-    rabbit_router:deliver(rabbit_router:match_bindings(Name, fun (#binding{args = Spec}) ->
-                                                                     headers_match(Spec, Headers)
-                                                             end),
+    rabbit_router:deliver(rabbit_router:match_bindings(
+                            Name, fun (#binding{args = Spec}) ->
+                                          headers_match(Spec, Headers)
+                                  end),
                           Delivery).
 
 default_headers_match_kind() -> all.
diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl
index 5080b3c9..1c8c8e11 100644
--- a/src/rabbit_exchange_type_topic.erl
+++ b/src/rabbit_exchange_type_topic.erl
@@ -35,7 +35,8 @@
 -behaviour(rabbit_exchange_type).
 
 -export([description/0, publish/2]).
--export([validate/1, create/1, recover/2, delete/2, add_binding/2, delete_binding/2]).
+-export([validate/1, create/1, recover/2, delete/2, add_binding/2,
+         delete_binding/2]).
 -include("rabbit_exchange_type_spec.hrl").
 
 -rabbit_boot_step({?MODULE,
@@ -55,12 +56,12 @@ description() ->
     [{name, <<"topic">>},
      {description, <<"AMQP topic exchange, as per the AMQP specification">>}].
 
-publish(#exchange{name = Name},
-        Delivery = #delivery{message = #basic_message{routing_key = RoutingKey}}) ->
-    rabbit_router:deliver(rabbit_router:match_bindings(Name,
-                                                       fun (#binding{key = BindingKey}) ->
-                                                               topic_matches(BindingKey, RoutingKey)
-                                                       end),
+publish(#exchange{name = Name}, Delivery =
+        #delivery{message = #basic_message{routing_key = RoutingKey}}) ->
+    rabbit_router:deliver(rabbit_router:match_bindings(
+                            Name, fun (#binding{key = BindingKey}) ->
+                                          topic_matches(BindingKey, RoutingKey)
+                                  end),
                           Delivery).
 
 split_topic_key(Key) ->
@@ -80,7 +81,8 @@ topic_matches1([], []) ->
     true;
 topic_matches1(["*" | PatRest], [_ | ValRest]) ->
     topic_matches1(PatRest, ValRest);
-topic_matches1([PatElement | PatRest], [ValElement | ValRest]) when PatElement == ValElement ->
+topic_matches1([PatElement | PatRest], [ValElement | ValRest])
+  when PatElement == ValElement ->
     topic_matches1(PatRest, ValRest);
 topic_matches1(_, _) ->
     false.
@@ -88,7 +90,8 @@ topic_matches1(_, _) ->
 last_topic_match(P, R, []) ->
     topic_matches1(P, R);
 last_topic_match(P, R, [BacktrackNext | BacktrackList]) ->
-    topic_matches1(P, R) or last_topic_match(P, [BacktrackNext | R], BacktrackList).
+    topic_matches1(P, R) or
+        last_topic_match(P, [BacktrackNext | R], BacktrackList).
 
 validate(_X) -> ok.
 create(_X) -> ok.
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 353ca5be..94c88673 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -302,7 +302,8 @@ test_topic_match(P, R) ->
     test_topic_match(P, R, true).
 
 test_topic_match(P, R, Expected) ->
-    case rabbit_exchange_type_topic:topic_matches(list_to_binary(P), list_to_binary(R)) of
+    case rabbit_exchange_type_topic:topic_matches(list_to_binary(P),
+                                                  list_to_binary(R)) of
         Expected ->
             passed;
         _ ->