diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-09 17:52:51 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-09 17:52:51 +0100 |
| commit | 62a67bbe688bc5ce5aa0400da25a89fb9e852acb (patch) | |
| tree | b8109c18535fd507d0bec8800724dcd138ce6d52 /src | |
| parent | 1c6d89e39997ae63422e6d0fa81e49baf35a0c8b (diff) | |
| parent | 417be4110aa613f248dbb64f2b4534661f9fa078 (diff) | |
| download | rabbitmq-server-git-62a67bbe688bc5ce5aa0400da25a89fb9e852acb.tar.gz | |
Merging default into bug 21673
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 7d4566025b..87f12df19a 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -58,7 +58,6 @@ -ifdef(use_specs). --type(get_msg_result() :: {queue_name(), pid(), msg_id(), boolean(), message()}). -type(qstats() :: {'ok', queue_name(), non_neg_integer(), non_neg_integer()}). -type(qlen() :: {'ok', non_neg_integer()}). -type(qfun(A) :: fun ((amqqueue()) -> A)). @@ -100,7 +99,7 @@ -spec(limit_all/3 :: ([pid()], pid(), pid() | 'undefined') -> ok_or_errors()). -spec(claim_queue/2 :: (amqqueue(), pid()) -> 'ok' | 'locked'). -spec(basic_get/3 :: (amqqueue(), pid(), boolean()) -> - {'ok', non_neg_integer(), get_msg_result()} | 'empty'). + {'ok', non_neg_integer(), qmsg()} | 'empty'). -spec(basic_consume/8 :: (amqqueue(), boolean(), pid(), pid(), pid() | 'undefined', ctag(), boolean(), any()) -> diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index a65bb31b52..e4b20f6b98 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -66,15 +66,13 @@ -ifdef(use_specs). --type(msg_to_deliver() :: {queue_name(), pid(), msg_id(), boolean(), message()}). - -spec(start_link/5 :: (channel_number(), pid(), pid(), username(), vhost()) -> pid()). -spec(do/2 :: (pid(), amqp_method()) -> 'ok'). -spec(do/3 :: (pid(), amqp_method(), maybe(content())) -> 'ok'). -spec(shutdown/1 :: (pid()) -> 'ok'). -spec(send_command/2 :: (pid(), amqp_method()) -> 'ok'). --spec(deliver/4 :: (pid(), ctag(), boolean(), msg_to_deliver()) -> 'ok'). +-spec(deliver/4 :: (pid(), ctag(), boolean(), qmsg()) -> 'ok'). -spec(conserve_memory/2 :: (pid(), boolean()) -> 'ok'). -spec(flushed/2 :: (pid(), pid()) -> 'ok'). -spec(list/0 :: () -> [pid()]). |