summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2011-02-14 16:57:16 +0000
committerEmile Joubert <emile@rabbitmq.com>2011-02-14 16:57:16 +0000
commitd864a53d009e695752e2ffbcabeb479f1781867e (patch)
treeaa1b003a43feef79e59b3ef4f918525ee2affc05 /src
parent0a45352fcee38d2b4e6e70e0153612516fb4e185 (diff)
downloadrabbitmq-server-git-d864a53d009e695752e2ffbcabeb479f1781867e.tar.gz
Sender-selected distribution updates
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_basic.erl2
-rw-r--r--src/rabbit_msg_store.erl4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index 5ea145d41b..7fa68882b1 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -101,7 +101,7 @@ strip_header(#content{properties = Props = #'P_basic'{headers = Headers}}
= DecodedContent, Key) when Headers =/= undefined ->
case lists:keyfind(Key, 1, Headers) of
false -> DecodedContent;
- Tuple -> Headers0 = lists:delete(Tuple, Headers),
+ Found -> Headers0 = lists:delete(Found, Headers),
rabbit_binary_generator:clear_encoded_content(
DecodedContent#content{
properties = Props#'P_basic'{headers = Headers0}})
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 82fb173542..f7afbef5ee 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -2001,7 +2001,7 @@ transform_msg_file(FileOld, FileNew, TransformFun) ->
{ok, RefNew} = file_handle_cache:open(FileNew, [raw, binary, write],
[{write_buffer,
?HANDLE_CACHE_BUFFER_SIZE}]),
- {ok, Acc, _IgnoreSize} =
+ {ok, _Acc, _IgnoreSize} =
rabbit_msg_file:scan(
RefOld, Size,
fun({Guid, _Size, _Offset, BinMsg}, ok) ->
@@ -2017,5 +2017,5 @@ transform_msg_file(FileOld, FileNew, TransformFun) ->
end, ok),
file_handle_cache:close(RefOld),
file_handle_cache:close(RefNew),
- ok = Acc.
+ ok.