Use `proc_lib:init_fail/2,3` where appropriate

13 files changed, 30 insertions, 31 deletions

diff --git a/lib/inets/src/http_server/httpd_acceptor.erl b/lib/inets/src/http_server/httpd_acceptor.erl
index d334b4d233..8b60978b86 100644
--- a/lib/inets/src/http_server/httpd_acceptor.erl
+++ b/lib/inets/src/http_server/httpd_acceptor.erl
@@ -66,8 +66,7 @@ acceptor_init(Parent, Manager, SocketType, Addr, Port, IpFamily,
 	    acceptor_loop(Manager, SocketType, Addr, Port, 
 			  ListenSocket, IpFamily,ConfigDb, AcceptTimeout);
 	Error ->
-	    proc_lib:init_ack(Parent, Error),
-	    error
+	    proc_lib:init_fail(Parent, Error, {exit, normal})
     end.
    
 do_init(SocketType, Addr, Port, IpFamily) ->
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index c79d3c4be4..1fb6dc4606 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -97,5 +97,7 @@
   %% If the "new" ssl is used then 'crypto' must be started before inets.
   {applications,[kernel,stdlib]},
   {mod,{inets_app,[]}},
-  {runtime_dependencies, ["stdlib-@OTP-18350@","ssl-9.0","runtime_tools-1.8.14",
-			  "mnesia-4.12","kernel-@OTP-18350@","erts-@OTP-18350@", "public_key-1.13"]}]}.
+  {runtime_dependencies,
+   ["stdlib-@OTP-18490@","stdlib-@OTP-18350@","ssl-9.0","runtime_tools-1.8.14",
+    "mnesia-4.12","kernel-@OTP-18350@","erts-@OTP-18350@", "public_key-1.13"]}
+ ]}.
diff --git a/lib/mnesia/src/mnesia.app.src b/lib/mnesia/src/mnesia.app.src
index 77bd1a7816..dfb5e82c93 100644
--- a/lib/mnesia/src/mnesia.app.src
+++ b/lib/mnesia/src/mnesia.app.src
@@ -51,4 +51,4 @@
 	       ]},
   {applications, [kernel, stdlib]},
   {mod, {mnesia_app, []}},
-  {runtime_dependencies, ["stdlib-3.4","kernel-5.3","erts-9.0"]}]}.
+  {runtime_dependencies, ["stdlib-@OTP-18490@","kernel-5.3","erts-9.0"]}]}.
diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl
index fce588444b..acbef16ea9 100644
--- a/lib/mnesia/src/mnesia_checkpoint.erl
+++ b/lib/mnesia/src/mnesia_checkpoint.erl
@@ -632,7 +632,8 @@ init(Cp) ->
     catch error:Reason -> %% system limit
 	    Msg = "Cannot create an ets table for pending transactions",
 	    Error = {error, {system_limit, Name, Msg, Reason}},
-	    proc_lib:init_ack(Cp#checkpoint_args.supervisor, Error)
+	    proc_lib:init_fail(
+              Cp#checkpoint_args.supervisor, Error, {exit, normal})
     end.
     
 prepare_tab(Cp, R) ->
diff --git a/lib/reltool/src/reltool.app.src b/lib/reltool/src/reltool.app.src
index fcefac3162..421ca01ea3 100644
--- a/lib/reltool/src/reltool.app.src
+++ b/lib/reltool/src/reltool.app.src
@@ -36,6 +36,8 @@
   {registered, []},
   {applications, [stdlib, kernel]},
   {env, []},
-  {runtime_dependencies, ["wx-@OTP-18350@","tools-2.6.14","stdlib-@OTP-18350@","sasl-@OTP-18350@",
-			  "kernel-@OTP-18350@","erts-@OTP-18350@"]}
+  {runtime_dependencies,
+   ["wx-@OTP-18350@","tools-2.6.14",
+    "stdlib-@OTP-18490@","stdlib-@OTP-18350@","sasl-@OTP-18350@",
+    "kernel-@OTP-18350@","erts-@OTP-18350@"]}
  ]}.
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 7027223fae..e14d171766 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -129,12 +129,13 @@ gen_spec(Pid) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Server
 
+-spec init(_) -> no_return().
 init([{parent,Parent}|_] = Options) ->
     try
         do_init(Options)
     catch
 	throw:{error,Reason} ->
-	    proc_lib:init_ack(Parent,{error,Reason});
+	    proc_lib:init_fail(Parent,{error,Reason},{exit,normal});
         error:Reason:Stacktrace ->
             exit({Reason, Stacktrace})
     end.
diff --git a/lib/reltool/src/reltool_sys_win.erl b/lib/reltool/src/reltool_sys_win.erl
index e24f468f67..c8cf692647 100644
--- a/lib/reltool/src/reltool_sys_win.erl
+++ b/lib/reltool/src/reltool_sys_win.erl
@@ -183,7 +183,7 @@ do_init([{safe_config, Safe}, {parent, Parent} | Options]) ->
 
 restart_server_safe_config(true,Parent,Reason) ->
     io:format("~w(~w): <ERROR> ~tp\n", [?MODULE, ?LINE, Reason]),
-    proc_lib:init_ack(Parent, {error,Reason});
+    proc_lib:init_fail(Parent, {error,Reason}, {exit,normal});
 restart_server_safe_config(false,Parent,Reason) ->
     wx:new(),
     Strings =
@@ -200,7 +200,7 @@ restart_server_safe_config(false,Parent,Reason) ->
 	    do_init([{safe_config,true},{parent,Parent},?safe_config]);
 	?wxID_CANCEL ->
 	    io:format("~w(~w): <ERROR> ~tp\n", [?MODULE, ?LINE, Reason]),
-	    proc_lib:init_ack(Parent,{error,Reason})
+	    proc_lib:init_fail(Parent, {error,Reason}, {exit,normal})
     end.
 
 exit_dialog([]) ->
diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index d37aa6c28a..406d985a1a 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.erl
@@ -237,10 +237,10 @@ init(Prio, NoteStore, MasterAgent, Parent, Opts) ->
 	    end;
 	{error, Reason} ->
 	    config_err("failed starting net-if: ~n~p", [Reason]),
-	    proc_lib:init_ack({error, Reason});
+	    proc_lib:init_fail({error, Reason}, {exit, normal});
 	Error ->
 	    config_err("failed starting net-if: ~n~p", [Error]),
-	    proc_lib:init_ack({error, Error})
+	    proc_lib:init_fail({error, Error}, {exit, normal})
     end.
 
 do_init(Prio, NoteStore, MasterAgent, Parent, Opts) ->
diff --git a/lib/snmp/src/app/snmp.app.src b/lib/snmp/src/app/snmp.app.src
index a18ea083fd..44460a2b0c 100644
--- a/lib/snmp/src/app/snmp.app.src
+++ b/lib/snmp/src/app/snmp.app.src
@@ -141,5 +141,6 @@
   %% before snmp.
   {applications, [kernel, stdlib]},
   {mod, {snmp_app, []}},
-  {runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14","mnesia-4.12",
-			  "kernel-8.0","erts-12.0","crypto-4.6"]}]}.
+  {runtime_dependencies,
+   ["stdlib-@OTP-18490@","runtime_tools-1.8.14","mnesia-4.12",
+    "kernel-8.0","erts-12.0","crypto-4.6"]}]}.
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index aded3fc06e..5e0c756cba 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -62,6 +62,6 @@
 			  "erts-@OTP-17932@",
 			  "kernel-@OTP-17932@",
 			  "public_key-1.6.1",
-                          "stdlib-@OTP-17932@",
+                          "stdlib-@OTP-18490@","stdlib-@OTP-17932@",
                           "runtime_tools-1.15.1"
 			 ]}]}.
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index 00587eecba..46f2b20aff 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -93,7 +93,7 @@ acceptor_init(Parent, SystemSup,
                             Opts1 = ?DELETE_INTERNAL_OPT(lsocket, Opts),
                             acceptor_loop(Port, Address, Opts1, NewLSock, AcceptTimeout, SystemSup);
                         {error,Error} ->
-                            proc_lib:init_ack(Parent, {error,Error})
+                            proc_lib:init_fail(Parent, {error,Error}, {exit, normal})
                     end
             end;
 
@@ -104,7 +104,7 @@ acceptor_init(Parent, SystemSup,
                     proc_lib:init_ack(Parent, {ok, self()}),
                     acceptor_loop(Port, Address, Opts, LSock, AcceptTimeout, SystemSup);
                 {error,Error} ->
-                    proc_lib:init_ack(Parent, {error,Error})
+                    proc_lib:init_fail(Parent, {error,Error}, {exit, normal})
             end
     end.
 
diff --git a/lib/wx/src/wx.app.src b/lib/wx/src/wx.app.src
index 91ee7a7589..c5136b23b8 100644
--- a/lib/wx/src/wx.app.src
+++ b/lib/wx/src/wx.app.src
@@ -35,5 +35,5 @@
   {registered, []},
   {applications, [stdlib, kernel]},
   {env, []},
-  {runtime_dependencies, ["stdlib-3.15","kernel-8.0","erts-12.0"]}
+  {runtime_dependencies, ["stdlib-@OTP-18490@","kernel-8.0","erts-12.0"]}
  ]}.
diff --git a/lib/wx/src/wx_object.erl b/lib/wx/src/wx_object.erl
index 81d188b26a..ba07756cd2 100644
--- a/lib/wx/src/wx_object.erl
+++ b/lib/wx/src/wx_object.erl
@@ -235,7 +235,7 @@ start_link(Name, Mod, Args, Options) ->
     gen_response(gen:start(?MODULE, link, Name, Mod, Args, [get(?WXE_IDENTIFIER)|Options])).
 
 gen_response({ok, Pid}) ->
-    receive {ack, Pid, Ref = #wx_ref{}} -> Ref end;
+    receive {started, Pid, Ref = #wx_ref{}} -> Ref end;
 gen_response(Reply) ->
     Reply.
 
@@ -407,30 +407,23 @@ init_it(Starter, Parent, Name, Mod, Args, [WxEnv|Options]) ->
 	{#wx_ref{} = Ref, State, Timeout} ->
 	    init_it2(Ref, Starter, Parent, Name, State, Mod, Timeout, Debug);
 	{stop, Reason} ->
-	    proc_lib:init_ack(Starter, {error, Reason}),
 	    exit(Reason);
 	ignore ->
-	    proc_lib:init_ack(Starter, ignore),
-	    exit(normal);
+	    proc_lib:init_fail(Starter, ignore, {exit, normal});
 	{'EXIT', Reason} ->
-	    proc_lib:init_ack(Starter, {error, Reason}),
 	    exit(Reason);
 	Else ->
-	    Error = {bad_return_value, Else},
-	    proc_lib:init_ack(Starter, {error, Error}),
-	    exit(Error)
+	    exit({bad_return_value, Else})
     end.
 %% @hidden
 init_it2(Ref, Starter, Parent, Name, State, Mod, Timeout, Debug) ->
     ok = wxe_util:register_pid(Ref),
     case ?CLASS_T(Ref#wx_ref.type, wxWindow) of
 	false -> 
-	    Reason = {Ref, "not a wxWindow subclass"},
-	    proc_lib:init_ack(Starter, {error, Reason}),
-	    exit(Reason);
+	    exit({Ref, "not a wxWindow subclass"});
 	true ->
 	    proc_lib:init_ack(Starter, {ok, self()}),
-	    proc_lib:init_ack(Starter, Ref#wx_ref{state=self()}),
+	    Starter ! {started, self(), Ref#wx_ref{state=self()}},
 	    loop(Parent, Name, State, Mod, Timeout, Debug)
     end.