From 435a89b9d156f3f6d88416dedb8e75b0489eba80 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 1 Mar 2011 16:47:09 +0100
Subject: Fix three dialyzer warnings in kernel

Joint effort by Kostis, pan, egil & sverker
---
 lib/kernel/src/net_kernel.erl | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index f5e2820bbe..23db85e1f4 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -322,24 +322,19 @@ init({Name, LongOrShortNames, TickT}) ->
 	    process_flag(priority, max),
 	    Ticktime = to_integer(TickT),
 	    Ticker = spawn_link(net_kernel, ticker, [self(), Ticktime]),
-	    case auth:get_cookie(Node) of
-		Cookie when is_atom(Cookie) ->
-		    {ok, #state{name = Name,
-				node = Node,
-				type = LongOrShortNames,
-				tick = #tick{ticker = Ticker, time = Ticktime},
-				connecttime = connecttime(),
-				connections =
-				    ets:new(sys_dist,[named_table,
-						      protected,
-						      {keypos, 2}]),
-				listen = Listeners,
-				allowed = [],
-				verbose = 0
-			       }};
-		_ELSE ->
-		    {stop, {error,{bad_cookie, Node}}}
-	    end;
+	    {ok, #state{name = Name,
+			node = Node,
+			type = LongOrShortNames,
+			tick = #tick{ticker = Ticker, time = Ticktime},
+			connecttime = connecttime(),
+			connections =
+			ets:new(sys_dist,[named_table,
+					  protected,
+					  {keypos, 2}]),
+			listen = Listeners,
+			allowed = [],
+			verbose = 0
+		       }};
 	Error ->
 	    {stop, Error}
     end.
-- 
cgit v1.2.3


From be3218dc1bf7dec1217bcac82492a5550da7ee17 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 2 Mar 2011 12:00:19 +0100
Subject: Fix dialyzer warning in os:start_port_srv_loop

Rewrote the code a bit to silence dialyzer. Seems dialyzer can't
handle a function that either returns or loops forever depending on
function argument.
---
 lib/kernel/src/os.erl | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index ce8c581e08..95a2f71ec0 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -231,9 +231,13 @@ start_port_srv(Request) ->
 		catch
 		    error:_ -> false
 		end,
-    start_port_srv_loop(Request, StayAlive).
+    start_port_srv_handle(Request),
+    case StayAlive of
+	true -> start_port_srv_loop();
+	false -> exiting
+    end.
 
-start_port_srv_loop({Ref,Client}, StayAlive) ->
+start_port_srv_handle({Ref,Client}) ->
     Reply = try open_port({spawn, ?SHELL},[stream]) of
 		Port when is_port(Port) ->
 		    (catch port_connect(Port, Client)),
@@ -243,20 +247,18 @@ start_port_srv_loop({Ref,Client}, StayAlive) ->
 		error:Reason ->
 		    {Reason,erlang:get_stacktrace()}	    
 	    end,
-    Client ! {Ref,Reply},
-    case StayAlive of
-	true -> start_port_srv_loop(get_open_port_request(), true);
-	false -> exiting
-    end.
+    Client ! {Ref,Reply}.
 
-get_open_port_request() ->
+
+start_port_srv_loop() ->
     receive
 	{Ref, Client} = Request when is_reference(Ref),
 				     is_pid(Client) ->
-	    Request;
+	    start_port_srv_handle(Request);
 	_Junk ->
-	    get_open_port_request()
-    end.
+	    ignore
+    end,
+    start_port_srv_loop().
 
 %%
 %%  unix_get_data(Port) -> Result
-- 
cgit v1.2.3