Merge branch 'egil/xmerl/fix-unmatched_return/OTP-13595'

* egil/xmerl/fix-unmatched_return/OTP-13595:
  xmerl: Fix unmatched return warnings

6 files changed, 39 insertions, 45 deletions

diff --git a/lib/xmerl/src/xmerl_eventp.erl b/lib/xmerl/src/xmerl_eventp.erl
index 598d26261d..2cb76abc6e 100644
--- a/lib/xmerl/src/xmerl_eventp.erl
+++ b/lib/xmerl/src/xmerl_eventp.erl
@@ -199,7 +199,7 @@ cont2(F, Exception, Sofar, Fd, Fname, T, S) ->
 	    find_good_split(list_to_binary([Sofar,Bin]),
 			    F,Exception,Fd,Fname,T,S);
 	eof ->
-	    file:close(Fd),
+	    ok = file:close(Fd),
 	    NewS = xmerl_scan:cont_state([{Fname, eof}|T], S),
 	    F(binary_to_list(Sofar), NewS);
 	Error ->
@@ -319,7 +319,7 @@ close(S) ->
 	[{_Fname, eof}|T] ->
 	    xmerl_scan:cont_state(T, S);
 	[{_Sofar, _Fname, Fd}|T] ->
-	    file:close(Fd),
+	    ok = file:close(Fd),
 	    xmerl_scan:cont_state(T, S)
     end.
 
diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl
index 196baacda7..318a0cf7f4 100644
--- a/lib/xmerl/src/xmerl_sax_parser.erl
+++ b/lib/xmerl/src/xmerl_sax_parser.erl
@@ -32,17 +32,13 @@
 %%----------------------------------------------------------------------
 %% External exports
 %%----------------------------------------------------------------------
--export([
-	 file/2,
-	 stream/2
-	]).
+-export([file/2,
+	 stream/2]).
 
 %%----------------------------------------------------------------------
 %% Internal exports
 %%----------------------------------------------------------------------
--export([
-	 default_continuation_cb/1
-        ]).
+-export([default_continuation_cb/1]).
 
 %%----------------------------------------------------------------------
 %% Macros
@@ -81,7 +77,7 @@ file(Name,Options) ->
 			 {current_location, CL},
 			 {entity, File}
 			 |Options]),
-	    file:close(FD),
+	    ok = file:close(FD),
 	    Res
     end.
 
diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index 200770a7cf..4d75805b9b 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -29,12 +29,10 @@
 %%----------------------------------------------------------------------
 %% External exports
 %%----------------------------------------------------------------------
--export([
-	 parse/2,
+-export([parse/2,
 	 parse_dtd/2,
 	 is_name_char/1,
-	 is_name_start/1
-        ]).
+	 is_name_start/1]).
 
 %%----------------------------------------------------------------------
 %% Internal exports
@@ -1681,7 +1679,7 @@ handle_external_entity({file, FileToOpen}, State) ->
 								     current_location=filename:dirname(FileToOpen),
 								     entity=filename:basename(FileToOpen),
 								     input_type=file}),
-	    file:close(FD),
+	    ok = file:close(FD),
 	    EntityState#xmerl_sax_parser_state.event_state
     end;
 handle_external_entity({http, Url}, State) ->
@@ -1700,8 +1698,8 @@ handle_external_entity({http, Url}, State) ->
 									 current_location=filename:dirname(Url),
 									 entity=filename:basename(Url),
 									 input_type=file}),
-		file:close(FD),
-		file:delete(TmpFile),
+		ok = file:close(FD),
+		ok = file:delete(TmpFile),
 		EntityState#xmerl_sax_parser_state.event_state
 	end
     catch
@@ -3471,17 +3469,17 @@ http_get_file(Host, Port, Key) ->
 		receive_msg(Socket, FD, true, SendTimeout)
 	    catch
 		throw:{error, Error} -> 
-		    file:close(FD),	 	
-		    file:delete(Filename),		    
+		    ok = file:close(FD),	 	
+		    ok = file:delete(Filename),		    
 		    throw({error, Error})
 	    end;
 	{error, _Reason} ->
-	    file:close(FD),	 	
-	    file:delete(Filename),
+	    ok = file:close(FD),	 	
+	    ok = file:delete(Filename),
 	    throw({error, lists:flatten(io_lib:format("Couldn't fetch http://~s:~p/~s",
 						      [Host, Port, Key]))})
     end,
-    file:close(FD),	 	
+    ok = file:close(FD),	 	
     Filename.
 
 %%----------------------------------------------------------------------
@@ -3498,11 +3496,11 @@ receive_msg(Socket, FD, WaitForHeader, Timeout) ->
 	{tcp_closed, Socket} ->
 	    ok;
 	{tcp, Socket, Response} when WaitForHeader == false  ->
-	    file:write(FD, Response),
+	    ok = file:write(FD, Response),
 	    receive_msg(Socket, FD, WaitForHeader, Timeout);
 	{tcp, Socket, Response} ->
 	    MsgBody = remove_header(Response),
-	    file:write(FD, MsgBody),
+	    ok = file:write(FD, MsgBody),
 	    receive_msg(Socket, FD, false, Timeout);
 	{tcp_error, Socket, _Reason} ->
 	    gen_tcp:close(Socket),
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index ea487a0900..2147a46a13 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -605,7 +605,7 @@ scan_document(Str0, S=#xmerl_scanner{event_fun = Event,
 	     schema ->
 		 case schemaLocations(Res, S5) of
 		     {ok, Schemas} ->
-			 cleanup(S5),
+			 _ = cleanup(S5),
 			 %%?dbg("Schemas: ~p~nRes: ~p~ninhertih_options(S): ~p~n",
 			 %%          [Schemas,Res,inherit_options(S5)]),
 			 XSDRes = xmerl_xsd:process_validate(Schemas, Res,
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index 412ef59e41..d97913ecbc 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -64,12 +64,10 @@
 %%----------------------------------------------------------------------
 %% External exports
 %%----------------------------------------------------------------------
--export([
-	 validate/2,validate/3,process_validate/2,process_validate/3,
+-export([validate/2,validate/3,process_validate/2,process_validate/3,
 	 process_schema/1,process_schema/2,
 	 process_schemas/1,process_schemas/2,
-	 state2file/1,state2file/2,file2state/1,format_error/1
-	]).
+	 state2file/1,state2file/2,file2state/1,format_error/1]).
 
 %%----------------------------------------------------------------------
 %% Internal exports
@@ -1178,7 +1176,7 @@ rename_redef_group(Name={LN,Scope,NS},S) ->
     NewName = {LN,['#redefine'|Scope],NS},
     case resolve({group,NewName},S) of
 	{SG=#schema_group{name=Name},_} ->
-	    save_object({group,SG#schema_group{name=NewName}},S),
+	    _ = save_object({group,SG#schema_group{name=NewName}},S),
 	    NewName;
 	_ ->
 	    failed
@@ -3436,7 +3434,7 @@ check_keys([Key=#id_constraint{selector={selector,SelectorPath},
 	    {L,S1} when length(L)==length(TargetNodeSet) -> 
 		%% Part1: 3.11.4.4.2.1
 		S2 = key_sequence_uniqueness(L,XMLEl,S1),
-		save_key(Key#id_constraint{key_sequence=L},S2),
+		_ = save_key(Key#id_constraint{key_sequence=L},S2),
 		S2;
 	    {Err,S1} ->
 		acc_errs(S1,{error_path(XMLEl,XMLEl#xmlElement.name),?MODULE,
@@ -4014,7 +4012,7 @@ merge_derived_types(XSDType,InstType,Blocks,Mode,S) ->
 	{error,S2} ->
 	    {InstType,S2};
 	{MergedType,S2} ->
-	    save_merged_type(MergedType,S2),
+	    _ = save_merged_type(MergedType,S2),
 	    {MergedType,S2}
     end.
 
@@ -4970,7 +4968,7 @@ save_schema_element(CM,S=#xsd_state{elementFormDefault = EFD,
 	      undefined -> [];
 	      _ -> TN
 	  end,
-    save_in_table({schema,TN2},Schema2,S),
+    _ = save_in_table({schema,TN2},Schema2,S),
     save_to_file(S).
 
 %% other_global_elements(S,ElementList) ->
@@ -5006,13 +5004,13 @@ save_to_file(S=#xsd_state{tab2file=TF}) ->
 	    {ok,IO}=file:open(filename:rootname(S#xsd_state.schema_name)++".tab",
 			      [write]),
 	    io:format(IO,"~p~n",[catch ets:tab2list(S#xsd_state.table)]),
-	    file:close(IO);
+	    ok = file:close(IO);
 	false ->
 	    ok;
 	IOFile ->
 	    {ok,IO}=file:open(IOFile,[write]),
 	    io:format(IO,"~p~n",[catch ets:tab2list(S#xsd_state.table)]),
-	    file:close(IO)
+	    ok = file:close(IO)
     end.
 
 save_merged_type(Type=#schema_simple_type{},S) ->
@@ -5034,25 +5032,25 @@ save_idc(unique,IDConstr,S) ->
     save_unique(IDConstr,S).
 
 save_key(Key,S) ->
-    save_object({key,Key},S),
+    _ = save_object({key,Key},S),
     S.
 
 save_keyref(KeyRef=#id_constraint{category=keyref},S) ->
     S1 = add_keyref(KeyRef,S),
-    save_object({keyref,KeyRef},S1),
+    _ = save_object({keyref,KeyRef},S1),
     S1;
 save_keyref(_,S) ->
     S.
 
 save_unique(Unique,S) ->
-    save_object({unique,Unique},S),
+    _ = save_object({unique,Unique},S),
     S.
 
 save_substitutionGroup([],S) ->
     S;
 save_substitutionGroup([{Head,Members}|SGs],S) ->
     %% save {head,[members]}
-    save_in_table({substitutionGroup,Head},Members,S),
+    _ = save_in_table({substitutionGroup,Head},Members,S),
     %% save {member,head}, an element can only be a member in one
     %% substitutionGroup
     lists:foreach(fun(X)->save_in_table({substitutionGroup_member,X},Head,S) end,Members),
diff --git a/lib/xmerl/src/xmerl_xsd_type.erl b/lib/xmerl/src/xmerl_xsd_type.erl
index 14a673b0c0..3ee5961522 100644
--- a/lib/xmerl/src/xmerl_xsd_type.erl
+++ b/lib/xmerl/src/xmerl_xsd_type.erl
@@ -229,11 +229,13 @@ check_float(Value) ->
 %%     {Mantissa,Exponent}=lists:splitwith(Pred,Value),
 %%     SkipEe = fun([]) -> [];(L) -> tl(L) end,
     case string:tokens(Value,"eE") of
-	[Mantissa,Exponent] ->
-	    {ok,_} = check_decimal(Mantissa),
-	    {ok,_} = check_integer(Exponent);
-	[Mantissa] ->
-	    check_decimal(Mantissa)
+        [Mantissa,Exponent] ->
+            {ok,_} = check_decimal(Mantissa),
+            {ok,_} = check_integer(Exponent),
+            ok;
+        [Mantissa] ->
+            {ok,_} = check_decimal(Mantissa),
+            ok
     end,
     {ok,Value}.
 %%     case {check_decimal(Mantissa),
@@ -367,7 +369,7 @@ check_dateTime("+"++_DateTime) ->
 check_dateTime(DateTime) ->
     [Date,Time] = string:tokens(DateTime,"T"),
     [Y,M,D] = string:tokens(Date,"-"),
-    check_year(Y),
+    {ok,_} = check_year(Y),
     {ok,_} = check_positive_integer(M),
     {ok,_} = check_positive_integer(D),
     check_time(Time).