summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-09-03 10:57:45 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-09-03 10:57:45 +0100
commitc1a6ec58a4da23e512a56714a4cbb0526321134a (patch)
treeb6691eeee61b8fc58dbcc3c0164e89ac122f6207 /src
parent3119a0ae9d84a49bb144452d63205cdf94040925 (diff)
downloadrabbitmq-server-git-c1a6ec58a4da23e512a56714a4cbb0526321134a.tar.gz
remove rabbit_basic:delivery/4 since it's not used by anything
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_basic.erl11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index b7cfa09a8a..348310d9b9 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -33,7 +33,7 @@
-include("rabbit.hrl").
-include("rabbit_framing.hrl").
--export([publish/1, message/4, properties/1, delivery/4, delivery/5]).
+-export([publish/1, message/4, properties/1, delivery/5]).
-export([publish/4, publish/7]).
-export([build_content/2, from_content/1]).
-export([is_message_persistent/1]).
@@ -50,9 +50,6 @@
-spec(publish/1 ::
(rabbit_types:delivery()) -> publish_result()).
--spec(delivery/4 ::
- (boolean(), boolean(), rabbit_types:maybe(rabbit_types:txn()),
- rabbit_types:message()) -> rabiit_types:delivery()).
-spec(delivery/5 ::
(boolean(), boolean(), rabbit_types:maybe(rabbit_types:txn()),
rabbit_types:message(), undefined | integer())
@@ -96,9 +93,6 @@ publish(Delivery = #delivery{
Other
end.
-delivery(Mandatory, Immediate, Txn, Message) ->
- delivery(Mandatory, Immediate, Txn, Message, undefined).
-
delivery(Mandatory, Immediate, Txn, Message, MsgSeqNo) ->
#delivery{mandatory = Mandatory, immediate = Immediate, txn = Txn,
sender = self(), message = Message, msg_seq_no = MsgSeqNo}.
@@ -168,7 +162,8 @@ publish(ExchangeName, RoutingKeyBin, Mandatory, Immediate, Txn, Properties,
BodyBin) ->
publish(delivery(Mandatory, Immediate, Txn,
message(ExchangeName, RoutingKeyBin,
- properties(Properties), BodyBin))).
+ properties(Properties), BodyBin),
+ undefined)).
is_message_persistent(#content{properties = #'P_basic'{
delivery_mode = Mode}}) ->