summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-10-05 10:09:50 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-10-05 10:09:50 +0100
commit6ff61b3f9f21d62c60650ebbeaae3b35b528a457 (patch)
treeef1506d41f5483b9397ecd50d628e7982a8859f3 /src
parent6c39deac72d788f09f27628b840169e1e106675d (diff)
parent7560cb1475881c5b60fc394c2098c3f8d0e8f60f (diff)
downloadrabbitmq-server-git-6ff61b3f9f21d62c60650ebbeaae3b35b528a457.tar.gz
merge default into bug20284
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_basic.erl26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index 8ca98f6e9f..1ac39b6538 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -56,28 +56,24 @@
rabbit_types:delivery()).
-spec(message/4 ::
(rabbit_exchange:name(), rabbit_router:routing_key(),
- properties_input(), binary())
- -> (rabbit_types:message() | rabbit_types:error(any()))).
+ properties_input(), binary()) ->
+ (rabbit_types:message() | rabbit_types:error(any()))).
-spec(properties/1 ::
(properties_input()) -> rabbit_framing:amqp_property_record()).
-spec(publish/4 ::
(rabbit_exchange:name(), rabbit_router:routing_key(),
- properties_input(), binary())
- -> publish_result()).
+ properties_input(), binary()) -> publish_result()).
-spec(publish/7 ::
(rabbit_exchange:name(), rabbit_router:routing_key(),
boolean(), boolean(), rabbit_types:maybe(rabbit_types:txn()),
- properties_input(), binary())
- -> publish_result()).
--spec(build_content/2 ::
- (rabbit_framing:amqp_property_record(), binary())
- -> rabbit_types:content()).
--spec(from_content/1 ::
- (rabbit_types:content())
- -> {rabbit_framing:amqp_property_record(), binary()}).
--spec(is_message_persistent/1 ::
- (rabbit_types:decoded_content())
- -> (boolean() | {'invalid', non_neg_integer()})).
+ properties_input(), binary()) -> publish_result()).
+-spec(build_content/2 :: (rabbit_framing:amqp_property_record(), binary()) ->
+ rabbit_types:content()).
+-spec(from_content/1 :: (rabbit_types:content()) ->
+ {rabbit_framing:amqp_property_record(), binary()}).
+-spec(is_message_persistent/1 :: (rabbit_types:decoded_content()) ->
+ (boolean() |
+ {'invalid', non_neg_integer()})).
-endif.