diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-07 19:02:25 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-07 19:02:25 +0000 |
| commit | 2206bf0c3bc6ad060d716f8c72174c6761833de6 (patch) | |
| tree | 83d0667bc3ddf21f9634455c61f5955713e97c11 | |
| parent | ce2a62e350924491118c769ee7e5bc0fa01c9188 (diff) | |
| download | rabbitmq-server-2206bf0c3bc6ad060d716f8c72174c6761833de6.tar.gz | |
fix a couple more spec errors and a genuine bug (lists:concat vs append)
| -rw-r--r-- | src/rabbit_access_control.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index e6dc60bd..3388e5e7 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -75,7 +75,7 @@ -spec(change_password_hash/2 :: (username(), password_hash()) -> 'ok'). -spec(set_admin/1 :: (username()) -> 'ok'). -spec(clear_admin/1 :: (username()) -> 'ok'). --spec(list_users/0 :: () -> [username()]). +-spec(list_users/0 :: () -> [{username(), boolean()}]). -spec(lookup_user/1 :: (username()) -> rabbit_types:ok(rabbit_types:user()) | rabbit_types:error('not_found')). diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 997ada83..cba776f9 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -361,7 +361,7 @@ consumers(#amqqueue{ pid = QPid }) -> delegate_call(QPid, consumers, infinity). consumers_all(VHostPath) -> - lists:concat( + lists:append( map(VHostPath, fun (Q) -> [{Q#amqqueue.name, ChPid, ConsumerTag, AckRequired} || {ChPid, ConsumerTag, AckRequired} <- consumers(Q)] diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 873268cd..77e8bc21 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -87,7 +87,7 @@ -spec(do/3 :: (pid(), rabbit_framing:amqp_method_record(), rabbit_types:maybe(rabbit_types:content())) -> 'ok'). -spec(shutdown/1 :: (pid()) -> 'ok'). --spec(send_command/2 :: (pid(), rabbit_framing:amqp_method()) -> 'ok'). +-spec(send_command/2 :: (pid(), rabbit_framing:amqp_method_record()) -> 'ok'). -spec(deliver/4 :: (pid(), rabbit_types:ctag(), boolean(), rabbit_amqqueue:qmsg()) -> 'ok'). |