Removed some unused fields

4 files changed, 19 insertions, 52 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 2ca78699d4..c3fac99864 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -130,7 +130,7 @@ recover_durable_queues() ->
               ok
       end).
 
-declare(Resource = #resource{name = Name}, Durable, AutoDelete, Args) ->
+declare(Resource = #resource{}, Durable, AutoDelete, Args) ->
     Q = start_queue_process(#amqqueue{name = Resource,
                                       durable = Durable,
                                       auto_delete = AutoDelete,
@@ -179,7 +179,7 @@ recover_bindings(Q = #amqqueue{name = QueueName, binding_specs = Specs}) ->
                   end, Specs),
     ok.
 
-modify_bindings(Queue = #resource{name = QueueName}, X = #resource{name = ExchangeName}, RoutingKey, Arguments,
+modify_bindings(Queue = #resource{}, X = #resource{}, RoutingKey, Arguments,
                 SpecPresentFun, SpecAbsentFun) ->
     rabbit_misc:execute_mnesia_transaction(
       fun () ->
@@ -349,7 +349,7 @@ delete_temp(Q = #amqqueue{name = QueueName}) ->
     ok = mnesia:delete({amqqueue, QueueName}),
     ok.
 
-delete_queue(Q = #amqqueue{name = QueueName, durable = Durable}) ->
+delete_queue(Q = #amqqueue{}) ->
     ok = delete_temp(Q).
     
 on_node_down(Node) ->                      
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 05ce07f27b..144253f89e 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -229,16 +229,9 @@ handle_method(#'channel.close'{}, _, State = #ch{writer_pid = WriterPid}) ->
     ok = rabbit_writer:shutdown(WriterPid),
     stop;
 
-handle_method(#'access.request'{realm = RealmNameBin,
-                                exclusive = Exclusive,
-                                passive = Passive,
-                                active = Active,
-                                write = Write,
-                                read = Read},_, State) ->
-    {reply, #'access.request_ok'{ticket = 1}, State};
-
-handle_method(#'basic.publish'{ticket = TicketNumber,
-                               exchange = ExchangeNameBin,
+handle_method(#'access.request'{},_, State) -> {reply, #'access.request_ok'{ticket = 1}, State};
+
+handle_method(#'basic.publish'{exchange = ExchangeNameBin,
                                routing_key = RoutingKey,
                                mandatory = Mandatory,
                                immediate = Immediate},
@@ -281,8 +274,7 @@ handle_method(#'basic.ack'{delivery_tag = DeliveryTag,
                                      uncommitted_ack_q = NewUAQ})
               end};
 
-handle_method(#'basic.get'{ticket = TicketNumber,
-                           queue = QueueNameBin,
+handle_method(#'basic.get'{queue = QueueNameBin,
                            no_ack = NoAck},
               _, State = #ch{ proxy_pid = ProxyPid, writer_pid = WriterPid,
                               next_tag = DeliveryTag }) ->
@@ -309,8 +301,7 @@ handle_method(#'basic.get'{ticket = TicketNumber,
             {reply, #'basic.get_empty'{cluster_id = <<>>}, State}
     end;
 
-handle_method(#'basic.consume'{ticket = TicketNumber,
-                               queue = QueueNameBin,
+handle_method(#'basic.consume'{queue = QueueNameBin,
                                consumer_tag = ConsumerTag,
                                no_local = _, % FIXME: implement
                                no_ack = NoAck,
@@ -451,8 +442,7 @@ handle_method(#'basic.recover'{}, _, _State) ->
     rabbit_misc:protocol_error(
       not_allowed, "attempt to recover a transactional channel",[]);
 
-handle_method(#'exchange.declare'{ticket = TicketNumber,
-                                  exchange = ExchangeNameBin,
+handle_method(#'exchange.declare'{exchange = ExchangeNameBin,
                                   type = TypeNameBin,
                                   passive = false,
                                   durable = Durable,
@@ -467,7 +457,7 @@ handle_method(#'exchange.declare'{ticket = TicketNumber,
     X = case rabbit_exchange:lookup(ExchangeName) of
             {ok, FoundX} -> FoundX;
             {error, not_found} ->
-                ActualNameBin = check_name('exchange', ExchangeNameBin),
+                check_name('exchange', ExchangeNameBin),
                 rabbit_exchange:declare(ExchangeName,
                                         CheckedType,
                                         Durable,
@@ -477,8 +467,7 @@ handle_method(#'exchange.declare'{ticket = TicketNumber,
     ok = rabbit_exchange:assert_type(X, CheckedType),
     return_ok(State, NoWait, #'exchange.declare_ok'{});
 
-handle_method(#'exchange.declare'{ticket = TicketNumber,
-                                  exchange = ExchangeNameBin,
+handle_method(#'exchange.declare'{exchange = ExchangeNameBin,
                                   type = TypeNameBin,
                                   passive = true,
                                   nowait = NoWait},
@@ -488,8 +477,7 @@ handle_method(#'exchange.declare'{ticket = TicketNumber,
     ok = rabbit_exchange:assert_type(X, rabbit_exchange:check_type(TypeNameBin)),
     return_ok(State, NoWait, #'exchange.declare_ok'{});
 
-handle_method(#'exchange.delete'{ticket = TicketNumber,
-                                 exchange = ExchangeNameBin,
+handle_method(#'exchange.delete'{exchange = ExchangeNameBin,
                                  if_unused = IfUnused,
                                  nowait = NoWait},
               _, State = #ch { virtual_host = VHostPath }) ->
@@ -505,8 +493,7 @@ handle_method(#'exchange.delete'{ticket = TicketNumber,
             return_ok(State, NoWait,  #'exchange.delete_ok'{})
     end;
 
-handle_method(#'queue.declare'{ticket = TicketNumber,
-                               queue = QueueNameBin,
+handle_method(#'queue.declare'{queue = QueueNameBin,
                                passive = false,
                                durable = Durable,
                                exclusive = ExclusiveDeclare,
@@ -553,8 +540,7 @@ handle_method(#'queue.declare'{ticket = TicketNumber,
         end,
     return_queue_declare_ok(State, NoWait, Q);
 
-handle_method(#'queue.declare'{ticket = TicketNumber,
-                               queue = QueueNameBin,
+handle_method(#'queue.declare'{queue = QueueNameBin,
                                passive = true,
                                nowait = NoWait},
               _, State = #ch{ virtual_host = VHostPath }) ->
@@ -562,13 +548,11 @@ handle_method(#'queue.declare'{ticket = TicketNumber,
     Q = rabbit_amqqueue:with_or_die(QueueName, fun (Q) -> Q end),
     return_queue_declare_ok(State, NoWait, Q);
 
-handle_method(#'queue.delete'{ticket = TicketNumber,
-                              queue = QueueNameBin,
+handle_method(#'queue.delete'{queue = QueueNameBin,
                               if_unused = IfUnused,
                               if_empty = IfEmpty,
                               nowait = NoWait
-                             },
-              _, State = #ch{ virtual_host = VHostPath }) ->
+                             },_, State) ->
     QueueName = expand_queue_name_shortcut(QueueNameBin, State),
     case rabbit_amqqueue:with_or_die(
            QueueName,
@@ -585,8 +569,7 @@ handle_method(#'queue.delete'{ticket = TicketNumber,
                                message_count = PurgedMessageCount})
     end;
 
-handle_method(#'queue.bind'{ticket = TicketNumber,
-                            queue = QueueNameBin,
+handle_method(#'queue.bind'{queue = QueueNameBin,
                             exchange = ExchangeNameBin,
                             routing_key = RoutingKey,
                             nowait = NoWait,
@@ -614,8 +597,7 @@ handle_method(#'queue.bind'{ticket = TicketNumber,
             return_ok(State, NoWait, #'queue.bind_ok'{})
     end;
 
-handle_method(#'queue.purge'{ticket = TicketNumber,
-                             queue = QueueNameBin,
+handle_method(#'queue.purge'{queue = QueueNameBin,
                              nowait = NoWait},
               _, State) ->
     QueueName = expand_queue_name_shortcut(QueueNameBin, State),
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 5a462e4be1..17d9fd97ad 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -90,7 +90,7 @@ recover_durable_exchanges() ->
                            end, ok, durable_exchanges)
       end).
 
-declare(Resource = #resource{name = Name}, Type, Durable, AutoDelete, Args) ->
+declare(Resource = #resource{}, Type, Durable, AutoDelete, Args) ->
     Exchange = #exchange{name = Resource,
                          type = Type,
                          durable = Durable,
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 259dc0d8df..c78a4ec38b 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -121,21 +121,6 @@ protocol_error(Error, Explanation, Params, Method) ->
     CompleteExplanation = lists:flatten(io_lib:format(Explanation, Params)),
     exit({amqp, Error, CompleteExplanation, Method}).
 
-boolean_config_param(Name, TrueValue, FalseValue, DefaultValue) ->
-    ActualValue = get_config(Name, DefaultValue),
-    if
-        ActualValue == TrueValue ->
-            true;
-        ActualValue == FalseValue ->
-            false;
-        true ->
-            rabbit_log:error(
-              "Bad setting for config param '~w': ~p~n" ++
-              "legal values are '~w', '~w'; using default value '~w'",
-              [Name, ActualValue, TrueValue, FalseValue, DefaultValue]),
-            DefaultValue == TrueValue
-    end.
-
 get_config(Key) ->
     case dirty_read({rabbit_config, Key}) of
         {ok, {rabbit_config, Key, V}} -> {ok, V};