From 03b748a502a966e9ba0e2349a7dddd5f4f149297 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 24 Sep 2012 14:28:02 +0200
Subject: inets: Dialyzer fixes

---
 lib/inets/src/http_client/httpc_handler.erl |  8 ++++++--
 lib/inets/src/http_client/httpc_manager.erl | 19 ++++---------------
 lib/inets/src/http_server/httpd_conf.erl    |  4 +---
 lib/inets/src/inets_app/inets.erl           |  9 ++-------
 4 files changed, 13 insertions(+), 27 deletions(-)

(limited to 'lib')

diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 6e164cb213..784a9c0019 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -142,8 +142,12 @@ stream_next(Pid) ->
 %%     Used for debugging and testing
 %%--------------------------------------------------------------------
 info(Pid) ->
-    call(info, Pid).
-
+    try 
+	call(info, Pid)
+    catch
+	_:_ ->
+	    []
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: stream(BodyPart, Request, Code) -> _
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index a267be5d05..c45dcab802 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -742,7 +742,7 @@ get_manager_info(#state{handler_db = HDB,
     SessionInfo = which_sessions2(SDB), 
     OptionsInfo = 
 	[{Item, get_option(Item, Options)} || 
-	    Item <- record_info(fields, options)], 
+		  Item <- record_info(fields, options)], 
     CookieInfo  = httpc_cookie:which_cookies(CDB),
     [{handlers, HandlerInfo}, 
      {sessions, SessionInfo}, 
@@ -770,20 +770,7 @@ get_handler_info(Tab) ->
     Pattern   = {'$2', '$1', '_'},
     Handlers1 = [{Pid, Id} || [Pid, Id] <- ets:match(Tab, Pattern)],
     Handlers2 = sort_handlers(Handlers1), 
-    Handlers3 = [{Pid, Reqs, 
-		  try
-		      begin
-			  httpc_handler:info(Pid)
-		      end
-		  catch
-		      _:_ ->
-			  %% Why would this crash? 
-			  %% Only if the process has died, but we don't 
-			  %% know about it?
-			  []
-		  end} || {Pid, Reqs} <- Handlers2],
-    Handlers3.
-
+    [{Pid, Reqs, httpc_handler:info(Pid)} || {Pid, Reqs} <- Handlers2].
 
 handle_request(#request{settings = 
 			#http_options{version = "HTTP/0.9"}} = Request,
@@ -1002,6 +989,8 @@ cast(ProfileName, Msg) ->
 
 get_option(proxy, #options{proxy = Proxy}) ->
     Proxy;
+get_option(https_proxy, #options{https_proxy = Proxy}) ->
+    Proxy;
 get_option(pipeline_timeout, #options{pipeline_timeout = Timeout}) ->
     Timeout;
 get_option(max_pipeline_length, #options{max_pipeline_length = Length}) ->
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index b575d7331b..747118431e 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -829,9 +829,7 @@ os_info(Info) ->
 	{OsFamily, _OsName} when Info =:= partial ->
 	    lists:flatten(io_lib:format("(~w)", [OsFamily]));
 	{OsFamily, OsName} ->
-	    lists:flatten(io_lib:format("(~w/~w)", [OsFamily, OsName]));
-	OsFamily ->
-	    lists:flatten(io_lib:format("(~w)", [OsFamily]))
+	    lists:flatten(io_lib:format("(~w/~w)", [OsFamily, OsName]))
     end.
 
 otp_release() ->
diff --git a/lib/inets/src/inets_app/inets.erl b/lib/inets/src/inets_app/inets.erl
index f33e0abe27..ed8082534f 100644
--- a/lib/inets/src/inets_app/inets.erl
+++ b/lib/inets/src/inets_app/inets.erl
@@ -274,13 +274,8 @@ sys_info() ->
 
 os_info() ->
     V = os:version(),
-    case os:type() of
-        {OsFam, OsName} ->
-            [{fam, OsFam}, {name, OsName}, {ver, V}];
-        OsFam ->
-            [{fam, OsFam}, {ver, V}]
-    end.
-
+    {OsFam, OsName} = os:type(),
+    [{fam, OsFam}, {name, OsName}, {ver, V}].
 
 print_mods_info(Versions) ->
     case key1search(mod_info, Versions) of
-- 
cgit v1.2.3