diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-06-11 14:47:58 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-06-11 14:47:58 +0100 |
| commit | 47fd76339d10ce82c431dcbd1293bd9eb2d8cbfc (patch) | |
| tree | dd840ffe46654cfa16746eabc3caf513fccd74d7 /src | |
| parent | 5f5050dcb6260436cc0120e5ec47ffd5eeeeb4e3 (diff) | |
| parent | 0c0cad2e0c1a7e8be813128e1faf364f60d3ef02 (diff) | |
| download | rabbitmq-server-git-47fd76339d10ce82c431dcbd1293bd9eb2d8cbfc.tar.gz | |
Merging bug 18524 onto default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_binary_generator.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_writer.erl | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl index 27a1275a31..81cf3ceec7 100644 --- a/src/rabbit_binary_generator.erl +++ b/src/rabbit_binary_generator.erl @@ -57,7 +57,7 @@ -type(frame() :: [binary()]). -spec(build_simple_method_frame/2 :: - (channel_number(), amqp_method()) -> frame()). + (channel_number(), amqp_method_record()) -> frame()). -spec(build_simple_content_frames/3 :: (channel_number(), content(), non_neg_integer()) -> [frame()]). -spec(build_heartbeat_frame/0 :: () -> frame()). diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 2ebb8f886f..76a500cedc 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -75,8 +75,8 @@ -spec(start_link/6 :: (channel_number(), pid(), pid(), username(), vhost(), pid()) -> pid()). --spec(do/2 :: (pid(), amqp_method()) -> 'ok'). --spec(do/3 :: (pid(), amqp_method(), maybe(content())) -> 'ok'). +-spec(do/2 :: (pid(), amqp_method_record()) -> 'ok'). +-spec(do/3 :: (pid(), amqp_method_record(), maybe(content())) -> 'ok'). -spec(shutdown/1 :: (pid()) -> 'ok'). -spec(send_command/2 :: (pid(), amqp_method()) -> 'ok'). -spec(deliver/4 :: (pid(), ctag(), boolean(), qmsg()) -> 'ok'). diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl index 54c60f5be0..3d10dc121e 100644 --- a/src/rabbit_writer.erl +++ b/src/rabbit_writer.erl @@ -50,17 +50,17 @@ -spec(start/3 :: (socket(), channel_number(), non_neg_integer()) -> pid()). -spec(start_link/3 :: (socket(), channel_number(), non_neg_integer()) -> pid()). --spec(send_command/2 :: (pid(), amqp_method()) -> 'ok'). --spec(send_command/3 :: (pid(), amqp_method(), content()) -> 'ok'). +-spec(send_command/2 :: (pid(), amqp_method_record()) -> 'ok'). +-spec(send_command/3 :: (pid(), amqp_method_record(), content()) -> 'ok'). -spec(send_command_and_signal_back/3 :: (pid(), amqp_method(), pid()) -> 'ok'). -spec(send_command_and_signal_back/4 :: (pid(), amqp_method(), content(), pid()) -> 'ok'). -spec(send_command_and_notify/5 :: - (pid(), pid(), pid(), amqp_method(), content()) -> 'ok'). + (pid(), pid(), pid(), amqp_method_record(), content()) -> 'ok'). -spec(internal_send_command/3 :: - (socket(), channel_number(), amqp_method()) -> 'ok'). + (socket(), channel_number(), amqp_method_record()) -> 'ok'). -spec(internal_send_command/5 :: - (socket(), channel_number(), amqp_method(), + (socket(), channel_number(), amqp_method_record(), content(), non_neg_integer()) -> 'ok'). -endif. |