diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2008-10-06 18:43:34 +0100 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2008-10-06 18:43:34 +0100 |
| commit | 13a0d5bc218b3fde3d1bdba2ed426ea0e0a136ff (patch) | |
| tree | d735a3b4efcb14dfc86b044397a94ded34dc2172 | |
| parent | 02b0cb0a4f074e2c3269061598fbdde74fd5b2ce (diff) | |
| download | rabbitmq-server-13a0d5bc218b3fde3d1bdba2ed426ea0e0a136ff.tar.gz | |
Fixes for dialyzer
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index c7b0fd5a..fb33a1e9 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -268,7 +268,7 @@ internal_delete(QueueName) -> end). delete_queue(#amqqueue{name = QueueName}) -> - ok = rabbit_exchange:delete_bindings(QueueName), + ok = rabbit_exchange:delete_bindings_for_queue(QueueName), ok = mnesia:delete({amqqueue, QueueName}), ok. diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 2c5aa308..946202ff 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -34,7 +34,7 @@ route/2]). -export([add_binding/4, delete_binding/4]). -export([delete/2]). --export([delete_bindings/1]). +-export([delete_bindings_for_queue/1]). -export([check_type/1, assert_type/2, topic_matches/2]). -import(mnesia). @@ -70,7 +70,7 @@ -spec(delete_binding/4 :: (exchange_name(), queue_name(), routing_key(), amqp_table()) -> bind_res() | {'error', 'binding_not_found'}). --spec(delete_bindings/1 :: (queue_name()) -> 'ok' | not_found()). +-spec(delete_bindings_for_queue/1 :: (queue_name()) -> 'ok'). -spec(topic_matches/2 :: (binary(), binary()) -> bool()). -spec(delete/2 :: (exchange_name(), bool()) -> 'ok' | not_found() | {'error', 'in_use'}). @@ -249,10 +249,10 @@ delete_bindings(Binding = #binding{exchange_name = ExchangeName, when QueueName == '_' andalso ExchangeName /= '_' -> indexed_delete(#route{binding = Binding}, - fun delete_forward_routes/1, fun mnesia:delete_object/1); + fun delete_forward_routes/1, fun mnesia:delete_object/1). % Must be called in a transaction -delete_bindings(QueueName) -> +delete_bindings_for_queue(QueueName) -> delete_bindings(#binding{exchange_name = '_', queue_name = QueueName, key = '_'}). |