From 59bb06a90248defb4c0be98f10afae88c2251fe7 Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Thu, 10 Feb 2011 16:18:50 +0100 Subject: Eliminated Dialyzer warnings when using exit or throw. --- lib/cosEvent/doc/src/notes.xml | 36 +++++++++++++++++----- lib/cosEvent/src/cosEventApp.erl | 4 ++- lib/cosEvent/vsn.mk | 13 +------- lib/cosEventDomain/doc/src/notes.xml | 34 +++++++++++++++++++- .../src/CosEventDomainAdmin_EventDomain_impl.erl | 6 +++- lib/cosEventDomain/src/cosEventDomainApp.erl | 4 ++- lib/cosEventDomain/vsn.mk | 13 +------- lib/cosNotification/doc/src/notes.xml | 16 +++++++++- lib/cosNotification/src/CosNotification_Common.erl | 8 +++-- lib/cosNotification/vsn.mk | 16 +--------- lib/cosProperty/doc/src/notes.xml | 30 +++++++++++++++++- ...sPropertyService_PropertySetDefFactory_impl.erl | 5 ++- .../CosPropertyService_PropertySetFactory_impl.erl | 7 +++-- lib/cosProperty/vsn.mk | 12 +------- lib/cosTime/doc/src/notes.xml | 34 +++++++++++++++++++- lib/cosTime/src/cosTime.erl | 4 ++- lib/cosTime/vsn.mk | 12 +------- lib/orber/doc/src/notes.xml | 18 ++++++++++- lib/orber/include/ifr_types.hrl | 4 +-- lib/orber/src/orber.app.src | 2 +- lib/orber/src/orber.erl | 4 ++- lib/orber/vsn.mk | 2 +- 22 files changed, 197 insertions(+), 87 deletions(-) diff --git a/lib/cosEvent/doc/src/notes.xml b/lib/cosEvent/doc/src/notes.xml index 78299a38dc..1a5c8afa17 100644 --- a/lib/cosEvent/doc/src/notes.xml +++ b/lib/cosEvent/doc/src/notes.xml @@ -4,7 +4,7 @@
- 19992010 + 19992011 Ericsson AB. All Rights Reserved. @@ -33,26 +33,48 @@
- cosEvent 2.1.8 + cosEvent 2.1.10
Improvements and New Features

- Removed the usage of the codeinclude tag in the documentation.

+ Eliminated Dialyzer warnings when using exit or throw.

- Own Id: OTP-8409 Aux Id:

+ Own Id: OTP-9050 Aux Id:
+
+ +
+ cosEvent 2.1.9
- Fixed Bugs and Malfunctions + Improvements and New Features + + +

+ Test suites published.

+

+ Own Id: OTP-8543 Aux Id:

+ + +
+
+ +
+ cosEvent 2.1.8 + +
+ Improvements and New Features -

The documentation EIX file was not generated.

-

Own id: OTP-8355 Aux Id:

+

+ Removed the usage of the codeinclude tag in the documentation.

+

+ Own Id: OTP-8409 Aux Id:
diff --git a/lib/cosEvent/src/cosEventApp.erl b/lib/cosEvent/src/cosEventApp.erl index 084490f845..373e2d170b 100644 --- a/lib/cosEvent/src/cosEventApp.erl +++ b/lib/cosEvent/src/cosEventApp.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. +%% Copyright Ericsson AB 2001-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 @@ -98,6 +98,8 @@ Trying to unregister ~p~n", [H,Accum]), uninstall() -> uninstall_loop(lists:reverse(?IDL_MODULES), ok). +%% To avoid dialyzer warnings due to the use of exit(..). +-spec(uninstall_loop/2 :: (_, _) -> no_return()). uninstall_loop([],ok) -> ok; uninstall_loop([],{exit, register}) -> diff --git a/lib/cosEvent/vsn.mk b/lib/cosEvent/vsn.mk index 8915903bbe..f0b4b0588c 100644 --- a/lib/cosEvent/vsn.mk +++ b/lib/cosEvent/vsn.mk @@ -1,13 +1,2 @@ -COSEVENT_VSN = 2.1.8 - -TICKETS = OTP-8355 \ - OTP-8409 - -TICKETS_2.1.7 = OTP-8201 - -TICKETS_2.1.6 = OTP-7987 - -TICKETS_2.1.5 = OTP-7837 - -TICKETS_2.1.4 = OTP-7595 +COSEVENT_VSN = 2.1.10 diff --git a/lib/cosEventDomain/doc/src/notes.xml b/lib/cosEventDomain/doc/src/notes.xml index 0ad42948af..a6b4471831 100644 --- a/lib/cosEventDomain/doc/src/notes.xml +++ b/lib/cosEventDomain/doc/src/notes.xml @@ -4,7 +4,7 @@
- 20012009 + 20012011 Ericsson AB. All Rights Reserved. @@ -31,6 +31,38 @@ notes.xml
+
+ cosEventDomain 1.1.10 + +
+ Improvements and New Features + + +

+ Eliminated Dialyzer warnings when using exit or throw.

+

+ Own Id: OTP-9050 Aux Id:

+ + +
+
+ +
+ cosEventDomain 1.1.9 + +
+ Improvements and New Features + + +

+ Test suites published.

+

+ Own Id: OTP-8543 Aux Id:

+ + +
+
+
cosEventDomain 1.1.8 diff --git a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl index 0b73100540..ddff0f8632 100644 --- a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl +++ b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. +%% Copyright Ericsson AB 2001-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 @@ -780,6 +780,8 @@ set_qos(_OE_This, State, NewQoS) -> QoS = cosEventDomainApp:get_qos(NewQoS), set_qos_helper(QoS, State, []). +%% To avoid dialyzer warnings due to the use of exit/throw. +-spec(set_qos_helper/3 :: (_, _, _) -> no_return()). set_qos_helper([], State, []) -> {reply, ok, State}; set_qos_helper([], _, Errors) -> @@ -830,6 +832,8 @@ validate_qos(_OE_This, State, WantedQoS) -> QoS = cosEventDomainApp:get_qos(WantedQoS), {reply, {ok, validate_qos_helper(QoS, State, [], [])}, State}. +%% To avoid dialyzer warnings due to the use of exit/throw. +-spec(validate_qos_helper/4 :: (_, _, _, _) -> no_return()). validate_qos_helper([], _, Properties, []) -> Properties; validate_qos_helper([], _, _, Errors) -> diff --git a/lib/cosEventDomain/src/cosEventDomainApp.erl b/lib/cosEventDomain/src/cosEventDomainApp.erl index d57f51443c..3cb4055fba 100644 --- a/lib/cosEventDomain/src/cosEventDomainApp.erl +++ b/lib/cosEventDomain/src/cosEventDomainApp.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. +%% Copyright Ericsson AB 2001-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 @@ -272,6 +272,8 @@ get_qos([]) -> get_qos(Properties) -> get_qos(Properties, [], []). +%% To avoid dialyzer warnings due to the use of exit/throw. +-spec(get_qos/3 :: (_, _, _) -> no_return()). get_qos([], Supported, []) -> Supported; get_qos([], _, Unsupported) -> diff --git a/lib/cosEventDomain/vsn.mk b/lib/cosEventDomain/vsn.mk index 483b130819..f6d1c7a332 100644 --- a/lib/cosEventDomain/vsn.mk +++ b/lib/cosEventDomain/vsn.mk @@ -1,13 +1,2 @@ -COSEVENTDOMAIN_VSN = 1.1.8 - -TICKETS = OTP-8353 \ - OTP-8355 - -TICKETS_1.1.7 = OTP-8201 - -TICKETS_1.1.6 = OTP-7987 - -TICKETS_1.1.5 = OTP-7837 - -TICKETS_1.1.4 = OTP-7595 +COSEVENTDOMAIN_VSN = 1.1.10 diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml index dfbabadfa2..a92aa4d11b 100644 --- a/lib/cosNotification/doc/src/notes.xml +++ b/lib/cosNotification/doc/src/notes.xml @@ -4,7 +4,7 @@
- 20002010 + 20002011 Ericsson AB. All Rights Reserved. @@ -31,6 +31,20 @@ notes.xml
+
cosNotification 1.1.16 + +
Improvements and New Features + + +

+ Eliminated Dialyzer warnings when using exit or throw.

+

+ Own Id: OTP-9050

+ + +
+
+
cosNotification 1.1.15
Improvements and New Features diff --git a/lib/cosNotification/src/CosNotification_Common.erl b/lib/cosNotification/src/CosNotification_Common.erl index 0e0f1da0d5..73a5550911 100644 --- a/lib/cosNotification/src/CosNotification_Common.erl +++ b/lib/cosNotification/src/CosNotification_Common.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-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 @@ -28,7 +28,6 @@ %%--------------- INCLUDES ----------------------------------- -include_lib("orber/include/corba.hrl"). --include_lib("orber/include/ifr_types.hrl"). %% Application files -include("CosNotification.hrl"). -include("CosNotifyChannelAdmin.hrl"). @@ -947,6 +946,9 @@ check_limits(LQS, NPR) -> validate_event_qos(Wanted, Curr) -> v_e_q_helper(Wanted, Curr, []), []. + +%% To avoid dialyzer warnings due to the use of exit/throw. +-spec(v_e_q_helper/3 :: (_, _, _) -> no_return()). v_e_q_helper([], _Curr, []) -> %% Parsed all and foynd no conflicts. ok; @@ -1071,6 +1073,8 @@ v_e_q_helper(What, _, _) -> %% LQS - local representation of QoS. %% Returns : {NewOMGStyleQoS, NewLocalQoS} | #'CosNotification_UnsupportedQoS'{} %%------------------------------------------------------------ +%% To avoid dialyzer warnings due to the use of exit/throw. +-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/cosNotification/vsn.mk b/lib/cosNotification/vsn.mk index be7aa56e15..6cea4b35b9 100644 --- a/lib/cosNotification/vsn.mk +++ b/lib/cosNotification/vsn.mk @@ -1,15 +1 @@ -COSNOTIFICATION_VSN = 1.1.15 - -TICKETS = OTP-8353 \ - OTP-8354 \ - OTP-8355 - -TICKETS_1.1.12 = OTP-8201 - -TICKETS_1.1.11 = OTP-7987 - -TICKETS_1.1.10 = OTP-7837 - -TICKETS_1.1.9 = OTP-7595 - -TICKETS_1.1.8 = OTP-7553 +COSNOTIFICATION_VSN = 1.1.16 diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml index e80c90849f..770d50f777 100644 --- a/lib/cosProperty/doc/src/notes.xml +++ b/lib/cosProperty/doc/src/notes.xml @@ -4,7 +4,7 @@
- 20002009 + 20002011 Ericsson AB. All Rights Reserved. @@ -31,6 +31,34 @@ notes.xml
+
+ cosProperty 1.1.11 + +
+ Fixed Bugs and Malfunctions + + +

Eliminated Dialyzer warnings when using exit or throw.

+

Own id: OTP-9050 Aux Id:

+ + +
+
+ +
+ cosProperty 1.1.12 + +
+ Fixed Bugs and Malfunctions + + +

Test suites published.

+

Own id: OTP-8543 Aux Id:

+ + +
+
+
cosProperty 1.1.11 diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl index b099026b88..45fd097bff 100644 --- a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl +++ b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% 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"); you may not use this file except in @@ -153,6 +153,9 @@ 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 ad3cdb62d4..c251421205 100644 --- a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl +++ b/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl @@ -2,10 +2,10 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% 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"); you may not use this file except in +%% Version 1.1, (the "License"); yu 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/. @@ -154,6 +154,9 @@ 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/cosProperty/vsn.mk b/lib/cosProperty/vsn.mk index c221e6fa4a..6d770a7d69 100644 --- a/lib/cosProperty/vsn.mk +++ b/lib/cosProperty/vsn.mk @@ -1,11 +1 @@ -COSPROPERTY_VSN = 1.1.11 - -TICKETS = OTP-8355 - -TICKETS_1.1.10 = OTP-8201 - -TICKETS_1.1.9 = OTP-7987 - -TICKETS_1.1.8 = OTP-7837 - -TICKETS_1.1.7 = OTP-7595 +COSPROPERTY_VSN = 1.1.13 diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml index 9f23a8633c..6a5bc7be00 100644 --- a/lib/cosTime/doc/src/notes.xml +++ b/lib/cosTime/doc/src/notes.xml @@ -4,7 +4,7 @@
- 20002009 + 20002011 Ericsson AB. All Rights Reserved. @@ -32,6 +32,38 @@ notes.xml
+
+ cosTime 1.1.10 + +
+ Improvements and New Features + + +

+ Eliminated Dialyzer warnings when using exit or throw.

+

+ Own Id: OTP-9050 Aux Id:

+ + +
+
+ +
+ cosTime 1.1.9 + +
+ Improvements and New Features + + +

+ Test suites published.

+

+ Own Id: OTP-8543 Aux Id:

+ + +
+
+
cosTime 1.1.8 diff --git a/lib/cosTime/src/cosTime.erl b/lib/cosTime/src/cosTime.erl index f4e67570ad..3f6050444a 100644 --- a/lib/cosTime/src/cosTime.erl +++ b/lib/cosTime/src/cosTime.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% 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"); you may not use this file except in @@ -110,6 +110,8 @@ 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}) -> diff --git a/lib/cosTime/vsn.mk b/lib/cosTime/vsn.mk index db51bf39b9..e93a4907ce 100644 --- a/lib/cosTime/vsn.mk +++ b/lib/cosTime/vsn.mk @@ -1,11 +1 @@ -COSTIME_VSN = 1.1.8 - -TICKETS = OTP-8355 - -TICKETS_1.1.7 = OTP-8201 - -TICKETS_1.1.6 = OTP-7987 - -TICKETS_1.1.5 = OTP-7837 - -TICKETS_1.1.4 = OTP-7595 +COSTIME_VSN = 1.1.10 diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml index ba16682f0b..589123ef73 100644 --- a/lib/orber/doc/src/notes.xml +++ b/lib/orber/doc/src/notes.xml @@ -4,7 +4,7 @@
- 19972010 + 19972011 Ericsson AB. All Rights Reserved. @@ -32,6 +32,22 @@ notes.xml
+
+ Orber 3.6.20 + +
+ Improvements and New Features + + +

+ Eliminated Dialyzer warnings when using exit or throw.

+

+ Own Id: OTP-9050 Aux Id:

+ + +
+
+
Orber 3.6.19 diff --git a/lib/orber/include/ifr_types.hrl b/lib/orber/include/ifr_types.hrl index d982850e98..f4a1c533e1 100644 --- a/lib/orber/include/ifr_types.hrl +++ b/lib/orber/include/ifr_types.hrl @@ -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 @@ -54,7 +54,7 @@ id = Obj#Object_type.id, defined_in = Obj#Object_type.defined_in, version = Obj#Object_type.version, - type = Obj#Object_type.type}. + type = Obj#Object_type.type}). -record(exceptiondescription, {name, id, defined_in, version, type}). diff --git a/lib/orber/src/orber.app.src b/lib/orber/src/orber.app.src index fe911d65a4..88df4162b6 100644 --- a/lib/orber/src/orber.app.src +++ b/lib/orber/src/orber.app.src @@ -101,7 +101,7 @@ orber_iiop_insup, orber_init, orber_reqno, orber_objkeyserver, orber_iiop_socketsup, orber_iiop_pm, orber_env]}, - {applications, [stdlib, kernel]}, + {applications, [stdlib, kernel, mnesia]}, {env, []}, {mod, {orber, []}} ]}. diff --git a/lib/orber/src/orber.erl b/lib/orber/src/orber.erl index c3d37ad1fb..9902306161 100644 --- a/lib/orber/src/orber.erl +++ b/lib/orber/src/orber.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. 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 @@ -1029,6 +1029,8 @@ remove_node(Node) when is_atom(Node) -> remove_tables(Tables, Node) -> remove_tables(Tables, Node, []). +%% To avoid dialyzer warnings due to the use of exit/throw. +-spec(remove_tables/3 :: (_, _, _) -> no_return()). remove_tables([], _, []) -> ok; remove_tables([], Node, Failed) -> ?EFORMAT("orber:remove_node(~p) failed. Unable to remove table(s): ~p", diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk index c265db188f..5f17cda229 100644 --- a/lib/orber/vsn.mk +++ b/lib/orber/vsn.mk @@ -1,3 +1,3 @@ -ORBER_VSN = 3.6.19 +ORBER_VSN = 3.6.20 -- cgit v1.2.3