diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-09 18:17:07 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-09 18:17:07 +0100 |
| commit | 408fc06f8c245393ec78ade90bb36e1b7047acd0 (patch) | |
| tree | 8aee3efe2ab0c1984a91e725471ffd172d4610c2 | |
| parent | 3dd129490755235c6261b38ce39c614a64f1212c (diff) | |
| parent | 14333df08bbb986c982fdf7a908cbb1cc1fc2ff9 (diff) | |
| download | rabbitmq-server-git-408fc06f8c245393ec78ade90bb36e1b7047acd0.tar.gz | |
Merging default into bug 22603
| -rw-r--r-- | include/rabbit.hrl | 2 | ||||
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_persister.erl | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 0cf6a10026..dbe62fdf9f 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -156,7 +156,7 @@ message :: message()}). %% this really should be an abstract type -type(msg_id() :: non_neg_integer()). --type(msg() :: {queue_name(), pid(), msg_id(), boolean(), message()}). +-type(qmsg() :: {queue_name(), pid(), msg_id(), boolean(), message()}). -type(listener() :: #listener{node :: erlang_node(), protocol :: atom(), diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index ceec00fd21..3bb4dbcdbe 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -98,7 +98,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(), msg()} | '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 847d4df22c..51eb93c5cf 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -72,7 +72,7 @@ -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()) -> '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()]). diff --git a/src/rabbit_persister.erl b/src/rabbit_persister.erl index e69c4bdc58..c1390bd484 100644 --- a/src/rabbit_persister.erl +++ b/src/rabbit_persister.erl @@ -70,11 +70,11 @@ -ifdef(use_specs). --type(qmsg() :: {amqqueue(), pkey()}). +-type(pmsg() :: {amqqueue(), pkey()}). -type(work_item() :: - {publish, message(), qmsg()} | - {deliver, qmsg()} | - {ack, qmsg()}). + {publish, message(), pmsg()} | + {deliver, pmsg()} | + {ack, pmsg()}). -spec(start_link/0 :: () -> {'ok', pid()} | 'ignore' | {'error', any()}). -spec(transaction/1 :: ([work_item()]) -> 'ok'). |