You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2018/03/09 18:09:20 UTC

[couchdb] 03/03: style fixes as per @davisp

This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit f999071ec6b347b27526047cc16a00811e21fdd9
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Mar 9 17:47:22 2018 +0100

    style fixes as per @davisp
---
 src/couch/src/couch_file.erl | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/couch/src/couch_file.erl b/src/couch/src/couch_file.erl
index 260a88c..9f668ea 100644
--- a/src/couch/src/couch_file.erl
+++ b/src/couch/src/couch_file.erl
@@ -216,9 +216,9 @@ sync(Filepath) when is_list(Filepath) ->
     case file:open(Filepath, [append, raw]) of
         {ok, Fd} ->
             try ok = file:sync(Fd) after ok = file:close(Fd) end;
-        Error ->
-            throw(Error)
-        end;
+        {error, Error} ->
+            erlang:error(Error)
+    end;
 sync(Fd) ->
     gen_server:call(Fd, sync, infinity).
 
@@ -393,18 +393,18 @@ init({Filepath, Options, ReturnPid, Ref}) ->
         % open in read mode first, so we don't create the file if it doesn't exist.
         case file:open(Filepath, [read, raw]) of
         {ok, Fd_Read} ->
-             case file:open(Filepath, OpenOptions) of
-               {ok, Fd} ->
-                  %% Save Fd in process dictionary for debugging purposes
-                  put(couch_file_fd, {Fd, Filepath}),
-                  ok = file:close(Fd_Read),
-                  maybe_track_open_os_files(Options),
-                  {ok, Eof} = file:position(Fd, eof),
-                  erlang:send_after(?INITIAL_WAIT, self(), maybe_close),
-                  {ok, #file{fd=Fd, eof=Eof, is_sys=IsSys, pread_limit=Limit}};
-                Error ->
-                  init_status_error(ReturnPid, Ref, Error)
-                end;
+            case file:open(Filepath, OpenOptions) of
+                {ok, Fd} ->
+                     %% Save Fd in process dictionary for debugging purposes
+                     put(couch_file_fd, {Fd, Filepath}),
+                     ok = file:close(Fd_Read),
+                     maybe_track_open_os_files(Options),
+                     {ok, Eof} = file:position(Fd, eof),
+                     erlang:send_after(?INITIAL_WAIT, self(), maybe_close),
+                     {ok, #file{fd=Fd, eof=Eof, is_sys=IsSys, pread_limit=Limit}};
+                 Error ->
+                     init_status_error(ReturnPid, Ref, Error)
+            end;
         Error ->
             init_status_error(ReturnPid, Ref, Error)
         end

-- 
To stop receiving notification emails like this one, please contact
jan@apache.org.