diff options
author | Niclas Eklund <[email protected]> | 2011-03-03 14:50:42 +0100 |
---|---|---|
committer | Niclas Eklund <[email protected]> | 2011-03-03 14:50:42 +0100 |
commit | 8c4ece5c36e153e739f344eccadd01b4c3e7ccce (patch) | |
tree | 7a9b26ea0b84670c6a404f1873cde80dc5c28528 /lib/cosTime/src/cosTime.erl | |
parent | 45892fd845b74532a6cae750372b6e80eb8e3ad9 (diff) | |
parent | 4414036566181c45f592036a03a3b5898f725d95 (diff) | |
download | otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.tar.gz otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.tar.bz2 otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.zip |
Merge branch 'nick/CORBA/avoid_warnings/OTP-9050' into dev
* nick/CORBA/avoid_warnings/OTP-9050:
Removed code commented out.
More specs removed.
More specs removed.
More specs removed.
Removed more spec:s that wasn't needed.
Removed spec:s that wasn't needed.
Updated light weight tests.
Updsated macro EFORMAT exit handling.
Corrected spec usage.
Eliminated Dialyzer warnings when using exit or throw.
Conflicts:
lib/cosEvent/doc/src/notes.xml
lib/cosEvent/vsn.mk
lib/cosEventDomain/doc/src/notes.xml
lib/cosEventDomain/vsn.mk
lib/cosNotification/vsn.mk
lib/cosProperty/doc/src/notes.xml
lib/cosProperty/vsn.mk
lib/cosTime/doc/src/notes.xml
lib/cosTime/vsn.mk
lib/orber/include/ifr_types.hrl
lib/orber/vsn.mk
Diffstat (limited to 'lib/cosTime/src/cosTime.erl')
-rw-r--r-- | lib/cosTime/src/cosTime.erl | 60 |
1 files changed, 40 insertions, 20 deletions
diff --git a/lib/cosTime/src/cosTime.erl b/lib/cosTime/src/cosTime.erl index f4e67570ad..f7d03650af 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 @@ -71,29 +71,39 @@ %%------------------------------------------------------------ install_time() -> - install_loop(?IDL_TIME_MODULES,[]). + case install_loop(?IDL_TIME_MODULES,[]) of + ok -> + ok; + {error, Reason} -> + exit(Reason) + end. install_timerevent() -> - install_loop(?IDL_TIMEREVENT_MODULES,[]). + case install_loop(?IDL_TIMEREVENT_MODULES,[]) of + ok -> + ok; + {error, Reason} -> + exit(Reason) + end. install_loop([], _) -> ok; install_loop([H|T], Accum) -> case catch H:'oe_register'() of {'EXIT',{unregistered,App}} -> - ?write_ErrorMsg("Unable to register '~p'; application ~p not registered. -Trying to unregister ~p~n", [H,App,Accum]), + ?write_ErrorMsg("Unable to register '~p'; application ~p not registered.\n" + "Trying to unregister ~p\n", [H,App,Accum]), uninstall_loop(Accum, {exit, register}); {'EXCEPTION',_} -> - ?write_ErrorMsg("Unable to register '~p'; propably already registered. -You are adviced to confirm this. -Trying to unregister ~p~n", [H,Accum]), + ?write_ErrorMsg("Unable to register '~p'; propably already registered.\n" + "You are adviced to confirm this.\n" + "Trying to unregister ~p\n", [H,Accum]), uninstall_loop(Accum, {exit, register}); ok -> install_loop(T, [H|Accum]); _ -> - ?write_ErrorMsg("Unable to register '~p'; reason unknown. -Trying to unregister ~p~n", [H,Accum]), + ?write_ErrorMsg("Unable to register '~p'; reason unknown.\n" + "Trying to unregister ~p\n", [H,Accum]), uninstall_loop(Accum, {exit, register}) end. @@ -105,33 +115,43 @@ Trying to unregister ~p~n", [H,Accum]), %%------------------------------------------------------------ uninstall_time() -> - uninstall_loop(lists:reverse(?IDL_TIME_MODULES),ok). + case uninstall_loop(lists:reverse(?IDL_TIME_MODULES),ok) of + ok -> + ok; + {error, Reason} -> + exit(Reason) + end. uninstall_timerevent() -> - uninstall_loop(lists:reverse(?IDL_TIMEREVENT_MODULES),ok). + case uninstall_loop(lists:reverse(?IDL_TIMEREVENT_MODULES),ok) of + ok -> + ok; + {error, Reason} -> + exit(Reason) + end. uninstall_loop([],ok) -> ok; uninstall_loop([],{exit, register}) -> - exit({?MODULE, "oe_register failed"}); + {error, {?MODULE, "oe_register failed"}}; uninstall_loop([],{exit, unregister}) -> - exit({?MODULE, "oe_unregister failed"}); + {error, {?MODULE, "oe_unregister failed"}}; uninstall_loop([],{exit, both}) -> - exit({?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"}); + {error, {?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. - + %%------------------------------------------------------------ %% function : start/stop %% Arguments: |