Fix unmatched_return warnings in release_handler

1 files changed, 44 insertions, 43 deletions

diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index c1b715b970..7c637b0adf 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -585,11 +585,9 @@ init([]) ->
 
 handle_call({unpack_release, ReleaseName}, _From, S)
   when S#state.masters == false ->
-    RelDir = S#state.rel_dir,
-    case catch do_unpack_release(S#state.root, RelDir,
+    case catch do_unpack_release(S#state.root, S#state.rel_dir,
 				 ReleaseName, S#state.releases) of
 	{ok, NewReleases, Vsn} -> 
-	    clean_release(RelDir, ReleaseName),
 	    {reply, {ok, Vsn}, S#state{releases = NewReleases}};
 	{error, Reason}   ->
 	    {reply, {error, Reason}, S}; 
@@ -739,7 +737,7 @@ mk_lib_name([]) -> [].
 handle_info(timeout, S) ->
     case soft_purge(S#state.unpurged) of
 	[] ->
-	    timer:cancel(S#state.timer),
+	    _ = timer:cancel(S#state.timer),
 	    {noreply, S#state{unpurged = [], timer = undefined}};
 	Unpurged ->
 	    {noreply, S#state{unpurged = Unpurged}}
@@ -850,15 +848,11 @@ do_unpack_release(Root, RelDir, ReleaseName, Releases) ->
     Dir = filename:join([RelDir, Vsn]),
     copy_file(RelFile, Dir, false),
 
-    {ok, NewReleases, Vsn}.
+    %% Clean release
+    _ = file:delete(Tar),
+    _ = file:delete(RelFile),
 
-%% Note that this function is not executed by a client
-%% release_handler.
-clean_release(RelDir, ReleaseName) ->
-    Tar = filename:join(RelDir, ReleaseName ++ ".tar.gz"),
-    Rel = filename:join(RelDir, ReleaseName ++ ".rel"),
-    file:delete(Tar),
-    file:delete(Rel).
+    {ok, NewReleases, Vsn}.
    
 check_rel(Root, RelFile, Masters) ->
     check_rel(Root, RelFile, [], Masters).
@@ -1184,7 +1178,8 @@ rename_tmp_service(EVsn,TmpVsn,NewVsn) ->
 	{error, _Error} ->
 	    ok;
 	_Data ->
-	    erlsrv:remove_service(ToName)
+	    {ok,_} = erlsrv:remove_service(ToName),
+	    ok
     end,
     rename_service(EVsn,FromName,ToName).
 
@@ -1237,13 +1232,12 @@ do_make_services_permanent(PermanentVsn,Vsn, PermanentEVsn, EVsn) ->
 	    UpdData = erlsrv:new_service(Name, Data, []),
 	    case erlsrv:store_service(EVsn,UpdData) of
 		ok ->
-		    erlsrv:disable_service(PermanentEVsn, PermName),
-		    erlsrv:enable_service(EVsn, Name),
-		    erlsrv:remove_service(PermName),
+		    {ok,_} = erlsrv:disable_service(PermanentEVsn, PermName),
+		    {ok,_} = erlsrv:enable_service(EVsn, Name),
+		    {ok,_} = erlsrv:remove_service(PermName),
 		    %%% Read comments about these above...
 		    os:putenv("ERLSRV_SERVICE_NAME", Name),
-		    heart:cycle(),
-		    ok;
+		    ok = heart:cycle();
 		Error4 ->
 		    throw(Error4)
 	    end
@@ -1288,7 +1282,7 @@ do_make_permanent(#state{releases = Releases,
 		_ ->
 		    ok
 	    end,
-	    init:make_permanent(filename:join(Dir, "start"), Sys),
+	    ok = init:make_permanent(filename:join(Dir, "start"), Sys),
 	    {ok, NewReleases, brutal_purge(Unpurged)};
 	{value, #release{status = permanent}} ->
 	    {ok, Releases, Unpurged};
@@ -1309,13 +1303,13 @@ do_back_service(OldVersion, CurrentVersion,OldEVsn,CurrentEVsn) ->
 		  Data ->
 		      erlsrv:new_service(OldName, Data, [])
 	      end,
-    case erlsrv:store_service(OldEVsn,UpdData) of
-	ok ->
-	    erlsrv:disable_service(CurrentEVsn,CurrentName),
-	    erlsrv:enable_service(OldEVsn,OldName);
-	Error2 ->
-	    throw(Error2)
-    end,
+    _ = case erlsrv:store_service(OldEVsn,UpdData) of
+	    ok ->
+		{ok,_} = erlsrv:disable_service(CurrentEVsn,CurrentName),
+		{ok,_} = erlsrv:enable_service(OldEVsn,OldName);
+	    Error2 ->
+		throw(Error2)
+	end,
     OldErlSrv = filename:nativename(erlsrv:erlsrv(OldEVsn)),
     CurrentErlSrv = filename:nativename(erlsrv:erlsrv(CurrentEVsn)),
     case heart:set_cmd(CurrentErlSrv ++ " remove " ++ CurrentName ++ 
@@ -1386,10 +1380,18 @@ set_permanent_files(RelDir, _EVsn, Vsn, Masters, _Static) ->
 
 
 do_remove_service(Vsn) ->
-    %%% Very unconditionally remove the service.
+    %% Very unconditionally remove the service.
+    %% Note that the service could already have been removed when
+    %% making another release permanent.
     ServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
 	++ "_" ++ Vsn,
-    erlsrv:remove_service(ServiceName).
+    case erlsrv:get_service(ServiceName) of
+	{error, _Error} ->
+	    ok;
+	_Data ->
+	    {ok,_} = erlsrv:remove_service(ServiceName),
+	    ok
+    end.
 
 do_remove_release(Root, RelDir, Vsn, Releases) ->
     % Decide which libs should be removed
@@ -1603,8 +1605,7 @@ do_write_file(File, Str, FileOpts) ->
     case file:open(File, [write | FileOpts]) of
 	{ok, Fd} ->
 	    io:put_chars(Fd, Str),
-	    file:close(Fd),
-	    ok;
+	    ok = file:close(Fd);
 	{error, Reason} ->
 	    {error, {Reason, File}}
     end.
@@ -1651,9 +1652,9 @@ get_appls([], Res) ->
 
 
 mon_nodes(true) ->
-    net_kernel:monitor_nodes(true);
+    ok = net_kernel:monitor_nodes(true);
 mon_nodes(false) ->
-    net_kernel:monitor_nodes(false),
+    ok = net_kernel:monitor_nodes(false),
     flush().
 
 flush() ->
@@ -1691,7 +1692,7 @@ prepare_restart_nt(#release{erts_vsn = EVsn, vsn = Vsn},
 	{error, _} = Error2 ->
 	    throw(Error2);
 	_X ->
-	    erlsrv:disable_service(EVsn, FutureServiceName),
+	    {ok,_} = erlsrv:disable_service(EVsn, FutureServiceName),
 	    ErlSrv = filename:nativename(erlsrv:erlsrv(EVsn)),
 	    StartDisabled = ErlSrv ++ " start_disabled " ++ FutureServiceName,
 	    case heart:set_cmd(StartDisabled) of
@@ -1877,8 +1878,7 @@ do_write_release(Dir, RELEASES, NewReleases) ->
     case file:open(filename:join(Dir, RELEASES), [write]) of
 	{ok, Fd} ->
 	    ok = io:format(Fd, "~p.~n", [NewReleases]),
-	    file:close(Fd),
-	    ok;
+	    ok = file:close(Fd);
 	{error, Reason} ->
 	    {error, Reason}
     end.
@@ -2010,7 +2010,7 @@ do_rename_files([]) ->
 %% Remove a list of files. Ignore failure.
 %%-----------------------------------------------------------------
 do_remove_files([File|Files]) ->
-    file:delete(File),
+    _ = file:delete(File),
     do_remove_files(Files);
 do_remove_files([]) ->
     ok.
@@ -2030,7 +2030,8 @@ do_ensure_RELEASES(RelFile) ->
 %% Make a directory, ignore failures (captured later).
 %%-----------------------------------------------------------------
 make_dir(Dir, false) ->
-    file:make_dir(Dir);
+    _ = file:make_dir(Dir),
+    ok;
 make_dir(Dir, Masters) ->
     lists:foreach(fun(Master) -> rpc:call(Master, file, make_dir, [Dir]) end,
 		  Masters).
@@ -2062,12 +2063,12 @@ at_all_masters([], _, _, _) ->
 %% Ignore {M,F,A} return value.
 %%-----------------------------------------------------------------
 takewhile(Master, Masters, M, F, A) ->
-    lists:takewhile(fun(Ma) when Ma == Master ->
-			    false;
-		       (Ma) ->
-			    rpc:call(Ma, M, F, A),
-			    true
-		    end, Masters),
+    _ = lists:takewhile(fun(Ma) when Ma == Master ->
+				false;
+			   (Ma) ->
+				rpc:call(Ma, M, F, A),
+				true
+			end, Masters),
     ok.
 
 consult(File, false)   -> file:consult(File);