aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/cosNotification/src/CosNotification_Common.erl4
-rw-r--r--lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl2
-rw-r--r--lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl4
-rw-r--r--lib/cosTime/src/cosTime.erl24
-rw-r--r--lib/orber/src/corba.erl6
5 files changed, 22 insertions, 18 deletions
diff --git a/lib/cosNotification/src/CosNotification_Common.erl b/lib/cosNotification/src/CosNotification_Common.erl
index 73a5550911..1e2d9640aa 100644
--- a/lib/cosNotification/src/CosNotification_Common.erl
+++ b/lib/cosNotification/src/CosNotification_Common.erl
@@ -948,7 +948,7 @@ validate_event_qos(Wanted, Curr) ->
[].
%% To avoid dialyzer warnings due to the use of exit/throw.
--spec(v_e_q_helper/3 :: (_, _, _) -> no_return()).
+%%-spec(v_e_q_helper/3 :: (_, _, _) -> no_return()).
v_e_q_helper([], _Curr, []) ->
%% Parsed all and foynd no conflicts.
ok;
@@ -1074,7 +1074,7 @@ v_e_q_helper(What, _, _) ->
%% Returns : {NewOMGStyleQoS, NewLocalQoS} | #'CosNotification_UnsupportedQoS'{}
%%------------------------------------------------------------
%% To avoid dialyzer warnings due to the use of exit/throw.
--spec(set_properties/9 :: (_, _, _, _, _, _, _, _, _) -> no_return()).
+%%-spec(set_properties/9 :: (_, _, _, _, _, _, _, _, _) -> no_return()).
set_properties([], Curr, channelAdm, _, [], NewQoS,_,_,LAS) ->
merge_properties(NewQoS, Curr, LAS);
set_properties([], Curr, _, _, [], NewQoS,_,_,LQS) ->
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
index 45fd097bff..82bc00aa7f 100644
--- a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
+++ b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
@@ -154,8 +154,6 @@ create_initial_propertysetdef(_OE_This, State, PropDefs) ->
evaluate_propertysetdef(SetDefs) ->
evaluate_propertysetdef(SetDefs, [], []).
-%% To avoid dialyzer warnings due to the use of exit/throw.
--spec(evaluate_propertysetdef/3 :: (_, _, _) -> no_return()).
evaluate_propertysetdef([], NewProperties, []) ->
%% No exceptions found.
NewProperties;
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
index c251421205..1a8f83617a 100644
--- a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
+++ b/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
@@ -5,7 +5,7 @@
%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); yu may not use this file except in
+%% Version 1.1, (the "License"); you may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
@@ -155,8 +155,6 @@ create_initial_propertyset(_OE_This, State, Properties) ->
evaluate_propertyset(Sets) ->
evaluate_propertyset(Sets, [], []).
-%% To avoid dialyzer warnings due to the use of exit/throw.
--spec(evaluate_propertyset/3 :: (_, _, _) -> no_return()).
evaluate_propertyset([], NewProperties, []) ->
%% No exceptions found.
NewProperties;
diff --git a/lib/cosTime/src/cosTime.erl b/lib/cosTime/src/cosTime.erl
index 3f6050444a..b02cb72509 100644
--- a/lib/cosTime/src/cosTime.erl
+++ b/lib/cosTime/src/cosTime.erl
@@ -110,30 +110,34 @@ uninstall_time() ->
uninstall_timerevent() ->
uninstall_loop(lists:reverse(?IDL_TIMEREVENT_MODULES),ok).
-%% To avoid dialyzer warnings due to the use of exit/throw.
--spec(uninstall_loop/2 :: (_, _) -> no_return()).
uninstall_loop([],ok) ->
ok;
uninstall_loop([],{exit, register}) ->
- exit({?MODULE, "oe_register failed"});
+ do_exit({?MODULE, "oe_register failed"});
uninstall_loop([],{exit, unregister}) ->
- exit({?MODULE, "oe_unregister failed"});
+ do_exit({?MODULE, "oe_unregister failed"});
uninstall_loop([],{exit, both}) ->
- exit({?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"});
+ do_exit({?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"});
uninstall_loop([H|T], Status) ->
case catch H:'oe_unregister'() of
ok ->
uninstall_loop(T, Status);
_ when Status == ok ->
- ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.
-You are adviced to confirm this.~n",[H]),
+ ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
+ "You are adviced to confirm this.~n",[H]),
uninstall_loop(T, {exit, unregister});
_ ->
- ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.
-You are adviced to confirm this.~n",[H]),
+ ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
+ "You are adviced to confirm this.~n",[H]),
uninstall_loop(T, {exit, both})
end.
-
+
+
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(do_exit/1 :: (_) -> no_return()).
+do_exit(Reason) ->
+ exit(Reason).
+
%%------------------------------------------------------------
%% function : start/stop
%% Arguments:
diff --git a/lib/orber/src/corba.erl b/lib/orber/src/corba.erl
index ea1363742c..f4a17c10e9 100644
--- a/lib/orber/src/corba.erl
+++ b/lib/orber/src/corba.erl
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -620,6 +620,8 @@ get_pid(Objkey) ->
%% Returns : Throws the exception.
%% Description:
%%----------------------------------------------------------------------
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(raise/1 :: (_) -> no_return()).
raise(E) ->
throw({'EXCEPTION', E}).
@@ -629,6 +631,8 @@ raise(E) ->
%% Returns : Throws the exception.
%% Description:
%%----------------------------------------------------------------------
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(raise_with_state/2 :: (_, _) -> no_return()).
raise_with_state(E, State) ->
throw({reply, {'EXCEPTION', E}, State}).