check_expiry_size => check_expiry

3 files changed, 8 insertions, 8 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index f185fc67..5e163800 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -402,13 +402,13 @@ check_int_arg({Type, _}, _) ->
 check_positive_expires({Type, Val}, Args) ->
     case check_int_arg({Type, Val}, Args) of
         ok when Val == 0 -> {error, {value_zero_or_less, Val}};
-        ok               -> rabbit_misc:check_expiry_size(Val);
+        ok               -> rabbit_misc:check_expiry(Val);
         Error            -> Error
     end.
 
 check_non_neg_ttl({Type, Val}, Args) ->
     case check_int_arg({Type, Val}, Args) of
-        ok when Val >= 0 -> rabbit_misc:check_expiry_size(Val);
+        ok when Val >= 0 -> rabbit_misc:check_expiry(Val);
         ok               -> {error, {value_less_than_zero, Val}};
         Error            -> Error
     end.
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index a1f52480..9bd1fad9 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -266,7 +266,7 @@ parse_expiration(#'P_basic'{expiration = Expiration}) ->
         {error, no_integer} = E ->
             E;
         {N, ""} ->
-            case rabbit_misc:check_expiry_size(N) of
+            case rabbit_misc:check_expiry(N) of
                 ok             -> {ok, N};
                 E = {error, _} -> E
             end;
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index a707b2b1..7ea345e1 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -63,7 +63,7 @@
 -export([version/0]).
 -export([sequence_error/1]).
 -export([json_encode/1, json_decode/1, json_to_term/1, term_to_json/1]).
--export([check_expiry_size/1]).
+-export([check_expiry/1]).
 -export([base64url/1]).
 
 %% Horrible macro to use in guards
@@ -233,7 +233,7 @@
 -spec(json_decode/1 :: (string()) -> {'ok', any()} | 'error').
 -spec(json_to_term/1 :: (any()) -> any()).
 -spec(term_to_json/1 :: (any()) -> any()).
--spec(check_expiry_size/1 :: (integer()) -> rabbit_types:ok_or_error(any())).
+-spec(check_expiry/1 :: (integer()) -> rabbit_types:ok_or_error(any())).
 -spec(base64url/1 :: (binary()) -> string()).
 
 -endif.
@@ -1005,11 +1005,11 @@ term_to_json(V) when is_binary(V) orelse is_number(V) orelse V =:= null orelse
                      V =:= true orelse V =:= false ->
     V.
 
-check_expiry_size(N) when N > ?MAX_EXPIRY_TIMER ->
+check_expiry(N) when N > ?MAX_EXPIRY_TIMER ->
     {error, {value_too_big, N}};
-check_expiry_size(N) when N < 0 ->
+check_expiry(N) when N < 0 ->
     {error, {negative_value, N}};
-check_expiry_size(_N) ->
+check_expiry(_N) ->
     ok.
 
 base64url(In) ->