Merge branch 'lukas/erts/otp-21-misc'

* lukas/erts/otp-21-misc:
  erts: Fix unused variable warning in unix prim file
  erts: Fix erts_os_times warning
  kernel: Fix comment in kernel_config
  kernel: Refactor erl_signal_handler startup
  kernel: Remove doc for unused browser_cmd variable

4 files changed, 13 insertions, 28 deletions

diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index f96d946a5d..7894600c21 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -122,21 +122,6 @@
       application. For more information about configuration parameters,
     see file <seealso marker="app"><c>app(4)</c></seealso>.</p>
     <taglist>
-      <tag><c>browser_cmd = string() | {M,F,A}</c></tag>
-      <item>
-        <p>When pressing the <em>Help</em> button in a tool such as Debugger,
-          the help text (an HTML file <c>File</c>) is by default
-          displayed in a Netscape browser, which is required to be
-          operational. This parameter can be used to change the command for
-          how to display the help text if another browser than Netscape
-          is preferred, or if another platform than Unix or Windows is
-          used.</p>
-        <p>If set to a string <c>Command</c>, the command
-          <c>"Command File"</c> is evaluated using
-	<seealso marker="os#cmd/1"><c>os:cmd/1</c></seealso>.</p>
-        <p>If set to a module-function-args tuple, <c>{M,F,A}</c>,
-          the call <c>apply(M,F,[File|A])</c> is evaluated.</p>
-      </item>
       <tag><c>distributed = [Distrib]</c></tag>
       <item>
         <p>Specifies which applications that are distributed and on which
diff --git a/lib/kernel/src/erl_signal_handler.erl b/lib/kernel/src/erl_signal_handler.erl
index 22f235d4e4..b76c2a217a 100644
--- a/lib/kernel/src/erl_signal_handler.erl
+++ b/lib/kernel/src/erl_signal_handler.erl
@@ -19,12 +19,21 @@
 
 -module(erl_signal_handler).
 -behaviour(gen_event).
--export([init/1, format_status/2,
+-export([start/0, init/1, format_status/2,
          handle_event/2, handle_call/2, handle_info/2,
          terminate/2, code_change/3]).
 
 -record(state,{}).
 
+start() ->
+    %% add signal handler
+    case whereis(erl_signal_server) of
+        %% in case of minimal mode
+        undefined -> ok;
+        _ ->
+            gen_event:add_handler(erl_signal_server, erl_signal_handler, [])
+    end.
+
 init(_Args) ->
     {ok, #state{}}.
 
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index 20aa47f602..ae982c1741 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -32,13 +32,7 @@
 start(_, []) ->
     case supervisor:start_link({local, kernel_sup}, kernel, []) of
 	{ok, Pid} ->
-            %% add signal handler
-            case whereis(erl_signal_server) of
-                %% in case of minimal mode
-                undefined -> ok;
-                _ ->
-                    ok = gen_event:add_handler(erl_signal_server, erl_signal_handler, [])
-            end,
+            ok = erl_signal_handler:start(),
             %% add error handler
             case logger:setup_standard_handler() of
                 ok -> {ok, Pid, []};
diff --git a/lib/kernel/src/kernel_config.erl b/lib/kernel/src/kernel_config.erl
index 535083ef27..c5ff1887c2 100644
--- a/lib/kernel/src/kernel_config.erl
+++ b/lib/kernel/src/kernel_config.erl
@@ -30,11 +30,8 @@
 %%%-----------------------------------------------------------------
 %%% This module implements a process that configures the kernel
 %%% application.
-%%% Its purpose is that in the init phase add an error_logger
-%%% and when it dies (when the kernel application dies) deleting the
-%%% previously installed error_logger.
-%%% Also, this process waits for other nodes at startup, if
-%%% specified.
+%%% Its purpose is that in the init phase waits for other nodes at startup,
+%%% if specified.
 %%%-----------------------------------------------------------------
 start_link() -> gen_server:start_link(kernel_config, [], []).