Merge with default

1 files changed, 14 insertions, 18 deletions

diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index b646f330..76c0a4ef 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -1054,29 +1054,25 @@ transform_queue(Dir, Gatherer, {JournalFun, SegmentFun}) ->
 transform_file(Path, Fun) ->
     PathTmp = Path ++ ".upgrade",
     case filelib:file_size(Path) of
-        0 ->
-            ok;
-        Size ->
-            {ok, PathTmpHdl} =
-                file_handle_cache:open(PathTmp, ?WRITE_MODE,
-                                       [{write_buffer, infinity}]),
+        0    -> ok;
+        Size -> {ok, PathTmpHdl} =
+                    file_handle_cache:open(PathTmp, ?WRITE_MODE,
+                                           [{write_buffer, infinity}]),
 
-            {ok, PathHdl} = file_handle_cache:open(
-                              Path, [{read_ahead, Size} | ?READ_MODE], []),
-            {ok, Content} = file_handle_cache:read(PathHdl, Size),
-            ok = file_handle_cache:close(PathHdl),
+                {ok, PathHdl} = file_handle_cache:open(
+                                  Path, [{read_ahead, Size} | ?READ_MODE], []),
+                {ok, Content} = file_handle_cache:read(PathHdl, Size),
+                ok = file_handle_cache:close(PathHdl),
 
-            ok = drive_transform_fun(Fun, PathTmpHdl, Content),
+                ok = drive_transform_fun(Fun, PathTmpHdl, Content),
 
-            ok = file_handle_cache:close(PathTmpHdl),
-            ok = file:rename(PathTmp, Path)
+                ok = file_handle_cache:close(PathTmpHdl),
+                ok = file:rename(PathTmp, Path)
     end.
 
 drive_transform_fun(Fun, Hdl, Contents) ->
     case Fun(Contents) of
-        stop ->
-            ok;
-        {Output, Contents1} ->
-            ok = file_handle_cache:append(Hdl, Output),
-            drive_transform_fun(Fun, Hdl, Contents1)
+        stop                -> ok;
+        {Output, Contents1} -> ok = file_handle_cache:append(Hdl, Output),
+                               drive_transform_fun(Fun, Hdl, Contents1)
     end.