Merge branch 'maint'

* maint:
  Fix a few dialyzer warnings

6 files changed, 15 insertions, 7 deletions

diff --git a/lib/orber/src/orber_ifr.erl b/lib/orber/src/orber_ifr.erl
index cc23d9e242..70e0cb3fca 100644
--- a/lib/orber/src/orber_ifr.erl
+++ b/lib/orber/src/orber_ifr.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -780,6 +780,7 @@ find_repository() ->
 
 'Repository__get_def_kind'(Objref) ->
     orber_ifr_repository:'_get_def_kind'(Objref).
+-spec 'Repository_destroy'(_) -> no_return().
 'Repository_destroy'(Objref) ->
     orber_ifr_repository:destroy(Objref).
 'Repository_lookup'(Objref,Search_name) ->
@@ -1405,6 +1406,7 @@ find_repository() ->
     orber_ifr_orb:create_wstring_tc(Bound).
 'ORB_create_sequence_tc'(Bound,Element_type) ->
     orber_ifr_orb:create_sequence_tc(Bound,Element_type).
+-spec 'ORB_create_recursive_sequence_tc'(_,_) -> no_return().
 'ORB_create_recursive_sequence_tc'(Bound,Offset) ->
     orber_ifr_orb:create_recursive_sequence_tc(Bound,Offset).
 'ORB_create_array_tc'(Length,Element_type) ->
diff --git a/lib/orber/src/orber_ifr_orb.erl b/lib/orber/src/orber_ifr_orb.erl
index a408a9a749..3969bbf37a 100644
--- a/lib/orber/src/orber_ifr_orb.erl
+++ b/lib/orber/src/orber_ifr_orb.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -89,6 +89,7 @@ create_wstring_tc(Bound) ->
 create_sequence_tc(Bound, Element_type) ->
     {tk_sequence,Element_type,Bound}.
 
+-spec create_recursive_sequence_tc(_, _) -> no_return().
 create_recursive_sequence_tc(Bound, Offset) ->
     orber:dbg("[~p] ~p:create_recursive_sequence_tc(~p, ~p);~n"
 	      "Create_recursive_sequence is not implemented.~n", 
diff --git a/lib/orber/src/orber_ifr_repository.erl b/lib/orber/src/orber_ifr_repository.erl
index 898fba99f3..8d52573e53 100644
--- a/lib/orber/src/orber_ifr_repository.erl
+++ b/lib/orber/src/orber_ifr_repository.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -66,6 +66,7 @@
 '_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_Repository, ObjType) ->
     orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}).
 
+-spec destroy(_) -> no_return().
 destroy({ObjType, ObjID}) ?tcheck(ir_Repository, ObjType) ->
     orber:dbg("[~p] ~p:destroy(~p, ~p);~n"
 	      "Destroying a repository is an error.~n", 
diff --git a/lib/orber/src/orber_iiop.erl b/lib/orber/src/orber_iiop.erl
index d23cd74146..8cb39c7365 100644
--- a/lib/orber/src/orber_iiop.erl
+++ b/lib/orber/src/orber_iiop.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -176,7 +176,7 @@ request({Host, Port, InitObjkey, Index, TaggedProfile, HostData},
             corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
     end.
 
-
+-dialyzer({no_improper_lists, encode_request/1}).
 encode_request(#giop_env{interceptors = false} = Env) ->
     case catch cdr_encode:enc_request(Env) of
 	{'EXCEPTION', Exc} ->
diff --git a/lib/orber/src/orber_iiop_inrequest.erl b/lib/orber/src/orber_iiop_inrequest.erl
index 625bfd3e86..9d84b63398 100644
--- a/lib/orber/src/orber_iiop_inrequest.erl
+++ b/lib/orber/src/orber_iiop_inrequest.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -240,6 +240,7 @@ check_context([_|Rest], Acc, Env) ->
 %%-----------------------------------------------------------------
 %% Func: call_interceptors
 %%-----------------------------------------------------------------
+-dialyzer({no_improper_lists, call_interceptors/7}).
 call_interceptors(SocketType, #giop_env{interceptors = {native, Ref, PIs},
 					ctx = Ctx} = Env, 
 		  ReqHdr, Rest, Len, ByteOrder, Msg) ->
@@ -276,6 +277,7 @@ call_interceptors(SocketType, #giop_env{interceptors = {portable, _PIs}} = Env,
 %%-----------------------------------------------------------------
 %% Func: call_interceptors_out
 %%-----------------------------------------------------------------
+-dialyzer({no_improper_lists, call_interceptors_out/7}).
 call_interceptors_out(#giop_env{interceptors = {native, Ref, PIs}, ctx = Ctx} = Env, 
 		      ReqId, Result, Obj, Type, Operation, TypeCodes) ->
     ReqHdr = #request_header{object_key = Obj,
diff --git a/lib/orber/src/orber_pi.erl b/lib/orber/src/orber_pi.erl
index 11c489bb17..19bb7af6c0 100644
--- a/lib/orber/src/orber_pi.erl
+++ b/lib/orber/src/orber_pi.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1030,6 +1030,7 @@ receive_exception(CRI, Mod) ->
 %%            SlotId - ulong()
 %% Returns  : {'EXCEPTION', #'PortableInterceptor_InvalidSlot'{}}
 %%------------------------------------------------------------
+-spec get_slot(_, _) -> no_return().
 get_slot(_XRI, _SlotId) ->
     corba:raise(#'PortableInterceptor_InvalidSlot'{}).
 
@@ -1185,6 +1186,7 @@ get_server_policy(#'ServerRequestInfo'{contexts = Ctxs}, _PolicyType) ->
 %%            Data - #any{}
 %% Returns  : {'EXCEPTION', #'PortableInterceptor_InvalidSlot'{}}
 %%------------------------------------------------------------
+-spec set_slot(_, _, _) -> no_return().
 set_slot(_SRI, _SlotId, _Data) ->
     corba:raise(#'PortableInterceptor_InvalidSlot'{}).