cosmetic

2 files changed, 12 insertions, 12 deletions

diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 4b0cf6d5..36888f33 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -430,7 +430,7 @@ handle_method(#'basic.qos'{prefetch_size = Size},
 
 handle_method(#'basic.qos'{prefetch_count = PrefetchCount},
               _, State = #ch{limiter = Limiter}) ->
-    rabbit_limiter:set_prefetch_count(Limiter, PrefetchCount),
+    ok = rabbit_limiter:limit(Limiter, PrefetchCount),
     {reply, #'basic.qos_ok'{}, State};
 
 handle_method(#'basic.recover'{requeue = true},
@@ -838,7 +838,7 @@ notify_limiter(Limiter, Acked) ->
                          ({_, _, _}, Acc)    -> Acc + 1
                      end, 0, queue:to_list(Acked)) of
         0     -> ok;
-        Count -> rabbit_limiter:decrement_capacity(Limiter, Count)
+        Count -> rabbit_limiter:ack(Limiter, Count)
     end.
 
 is_message_persistent(#content{properties = #'P_basic'{
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl
index 7ca9772b..12632625 100644
--- a/src/rabbit_limiter.erl
+++ b/src/rabbit_limiter.erl
@@ -36,15 +36,15 @@
 -export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2,
          handle_info/2]).
 -export([start_link/1]).
--export([set_prefetch_count/2, can_send/2, decrement_capacity/2]).
+-export([limit/2, can_send/2, ack/2]).
 
 %%----------------------------------------------------------------------------
 
 -ifdef(use_specs).
 
--spec(set_prefetch_count/2 :: (pid(), non_neg_integer()) -> 'ok').
+-spec(limit/2 :: (pid(), non_neg_integer()) -> 'ok').
 -spec(can_send/2 :: (pid(), pid()) -> bool()).
--spec(decrement_capacity/2 :: (pid(), non_neg_integer()) -> 'ok').
+-spec(ack/2 :: (pid(), non_neg_integer()) -> 'ok').
 
 -endif.
 
@@ -63,8 +63,8 @@ start_link(ChPid) ->
     {ok, Pid} = gen_server:start_link(?MODULE, [ChPid], []),
     Pid.
 
-set_prefetch_count(LimiterPid, PrefetchCount) ->
-    gen_server:cast(LimiterPid, {prefetch_count, PrefetchCount}).
+limit(LimiterPid, PrefetchCount) ->
+    gen_server:cast(LimiterPid, {limit, PrefetchCount}).
 
 %% Ask the limiter whether the queue can deliver a message without
 %% breaching a limit
@@ -73,8 +73,8 @@ can_send(LimiterPid, QPid) ->
 
 %% Let the limiter know that the channel has received some acks from a
 %% consumer
-decrement_capacity(LimiterPid, Magnitude) ->
-    gen_server:cast(LimiterPid, {decrement_capacity, Magnitude}).
+ack(LimiterPid, Count) ->
+    gen_server:cast(LimiterPid, {ack, Count}).
 
 %%----------------------------------------------------------------------------
 %% gen_server callbacks
@@ -89,12 +89,12 @@ handle_call({can_send, QPid}, _From, State = #lim{in_use = InUse}) ->
         false -> {reply, true, State#lim{in_use = InUse + 1}}
     end.
 
-handle_cast({prefetch_count, PrefetchCount}, State) ->
+handle_cast({limit, PrefetchCount}, State) ->
     {noreply, maybe_notify(State, State#lim{prefetch_count = PrefetchCount})};
 
-handle_cast({decrement_capacity, Magnitude}, State = #lim{in_use = InUse}) ->
+handle_cast({ack, Count}, State = #lim{in_use = InUse}) ->
     NewInUse = if InUse == 0 -> 0;
-                  true       -> InUse - Magnitude
+                  true       -> InUse - Count
                end,
     {noreply, maybe_notify(State, State#lim{in_use = NewInUse})}.