diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-01-15 13:21:10 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-01-15 13:21:10 +0000 |
| commit | c65a78ddee736dd6fedeffa3de88b3d346b08e19 (patch) | |
| tree | 6328a856034d711e3554fb0fe24091d60fce6ded /src | |
| parent | 0841aecc6986964c701afe323baa7fbdde0880cb (diff) | |
| download | rabbitmq-server-git-c65a78ddee736dd6fedeffa3de88b3d346b08e19.tar.gz | |
Undo gratuitous rename.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_queue_consumers.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl index 5087b93403..c410a0997c 100644 --- a/src/rabbit_queue_consumers.erl +++ b/src/rabbit_queue_consumers.erl @@ -251,7 +251,7 @@ subtract_acks(AckTags, CTag, ChPid, State) -> C = #cr{acktags = ChAckTags, limiter = Lim} -> {Unblocked, Lim2} = rabbit_limiter:ack_from_queue(Lim, CTag, length(AckTags)), - AckTags2 = subtract_acks0(AckTags, [], ChAckTags), + AckTags2 = subtract_acks(AckTags, [], ChAckTags), C2 = C#cr{acktags = AckTags2, limiter = Lim2}, case Unblocked of true -> unblock(C2, State); @@ -260,14 +260,14 @@ subtract_acks(AckTags, CTag, ChPid, State) -> end end. -subtract_acks0([], [], AckQ) -> +subtract_acks([], [], AckQ) -> AckQ; -subtract_acks0([], Prefix, AckQ) -> +subtract_acks([], Prefix, AckQ) -> queue:join(queue:from_list(lists:reverse(Prefix)), AckQ); -subtract_acks0([T | TL] = AckTags, Prefix, AckQ) -> +subtract_acks([T | TL] = AckTags, Prefix, AckQ) -> case queue:out(AckQ) of - {{value, T}, QTail} -> subtract_acks0(TL, Prefix, QTail); - {{value, AT}, QTail} -> subtract_acks0(AckTags, [AT | Prefix], QTail) + {{value, T}, QTail} -> subtract_acks(TL, Prefix, QTail); + {{value, AT}, QTail} -> subtract_acks(AckTags, [AT | Prefix], QTail) end. possibly_unblock(Update, ChPid, State) -> |