Merge branch 'ks/asn1-dialyzer-fixes' into dev

* ks/asn1-dialyzer-fixes:
  Shut off some dialyzer warnings

OTP-9063

3 files changed, 7 insertions, 9 deletions

diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 469a776527..947578f07d 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -149,7 +149,7 @@ compile1(File,Options) when is_list(Options) ->
 inline(true,Name,Module,Options) ->
     RTmodule = get_runtime_mod(Options),
     IgorOptions = igorify_options(remove_asn_flags(Options)),
-    IgorName = filename:rootname(filename:basename(Name)),
+    IgorName = list_to_atom(filename:rootname(filename:basename(Name))),
 %    io:format("*****~nName: ~p~nModules: ~p~nIgorOptions: ~p~n*****~n",
 %	      [IgorName,Modules++RTmodule,IgorOptions]),
     verbose("Inlining modules: ~p in ~p~n",[[Module]++RTmodule,IgorName],Options),
@@ -1185,6 +1185,7 @@ is_inline(Options) ->
 	_ ->
 	    lists:keymember(inline,1,Options)
     end.
+
 inline_output(Options,Default) ->
     case [X||{inline,X}<-Options] of
 	[OutputName] ->
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index cce6eb9831..d6f23aca06 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -326,16 +326,14 @@ gen_decode_constructed(Erules,Typename,D) when is_record(D,type) ->
 textual_order([#'ComponentType'{textual_order=undefined}|_],TermList) ->
     TermList;
 textual_order(CompList,TermList) when is_list(CompList) ->
-     OrderList = [Ix||#'ComponentType'{textual_order=Ix} <- CompList],
+    OrderList = [Ix||#'ComponentType'{textual_order=Ix} <- CompList],
     [Term||{_,Term}<-
 	       lists:sort(lists:zip(OrderList,
 				    lists:sublist(TermList,length(OrderList))))];
 	       %% sublist is just because Termlist can sometimes be longer than
 	       %% OrderList, which it really shouldn't
 textual_order({Root,Ext},TermList) ->
-    textual_order(Root ++ Ext,TermList);
-textual_order({Root1,Ext,Root2},TermList) ->
-    textual_order(Root1 ++ Ext ++ Root2, TermList).
+    textual_order(Root ++ Ext,TermList).
 
 to_textual_order({Root,Ext}) ->
     {to_textual_order(Root),Ext};
diff --git a/lib/asn1/src/asn1rt_ber_bin.erl b/lib/asn1/src/asn1rt_ber_bin.erl
index ab04d981b0..22f9f2ecfd 100644
--- a/lib/asn1/src/asn1rt_ber_bin.erl
+++ b/lib/asn1/src/asn1rt_ber_bin.erl
@@ -2192,12 +2192,12 @@ decode_tag_and_length(Buffer) ->
 %% Check if valid tag
 %%
 %% check_if_valid_tag(Tag, List_of_valid_tags, OptOrMand) -> name of the tag
-%%===============================================================================
+%%============================================================================
 
 check_if_valid_tag(<<0,0,_/binary>>,_,_) ->
     asn1_EOC;
 check_if_valid_tag(<<>>, _, OptOrMand) ->
-    check_if_valid_tag2(false,[],[],OptOrMand);
+    check_if_valid_tag2_error([], OptOrMand);
 check_if_valid_tag(Bytes, ListOfTags, OptOrMand) when is_binary(Bytes) ->
     {Tag, _, _} = decode_tag(Bytes),
     check_if_valid_tag(Tag, ListOfTags, OptOrMand);
@@ -2217,7 +2217,6 @@ check_if_valid_tag(Tag, ListOfTags, OptOrMand) ->
 
 check_if_valid_tag2(_Class_TagNo, [], Tag, MandOrOpt) ->
     check_if_valid_tag2_error(Tag,MandOrOpt);
-
 check_if_valid_tag2(Class_TagNo, [{TagName,TagList}|T], Tag, OptOrMand) ->
     case check_if_valid_tag_loop(Class_TagNo, TagList) of
 	true ->
@@ -2226,7 +2225,7 @@ check_if_valid_tag2(Class_TagNo, [{TagName,TagList}|T], Tag, OptOrMand) ->
 	    check_if_valid_tag2(Class_TagNo, T, Tag, OptOrMand)
     end.
 
--spec(check_if_valid_tag2_error/2 :: (term(),atom()) -> no_return()).
+-spec check_if_valid_tag2_error(term(), atom()) -> no_return().
 
 check_if_valid_tag2_error(Tag,mandatory) ->
     exit({error,{asn1,{invalid_tag,Tag}}});