diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-11-08 15:32:54 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-03-19 15:23:49 +0100 |
| commit | 3360bad9106938751cf06fd8a64bfe1e1c3d6940 (patch) | |
| tree | 62c031491e889cfd6511eccc8ec73a28f7eaa06f | |
| parent | 0f5e57fe26c02f58f16945bed96453429ff1ea57 (diff) | |
| download | strongswan-3360bad9106938751cf06fd8a64bfe1e1c3d6940.tar.bz2 strongswan-3360bad9106938751cf06fd8a64bfe1e1c3d6940.tar.xz | |
Remove result out parameter from EES Init
Error processing is done by the registered exception handler.
| -rw-r--r-- | src/charon-tkm/src/ees/esa_event_service.adb | 10 | ||||
| -rw-r--r-- | src/charon-tkm/src/ees/esa_event_service.ads | 7 | ||||
| -rw-r--r-- | src/charon-tkm/src/tkm/tkm.c | 8 |
3 files changed, 4 insertions, 21 deletions
diff --git a/src/charon-tkm/src/ees/esa_event_service.adb b/src/charon-tkm/src/ees/esa_event_service.adb index 7b35090af..5b5d7003b 100644 --- a/src/charon-tkm/src/ees/esa_event_service.adb +++ b/src/charon-tkm/src/ees/esa_event_service.adb @@ -45,21 +45,13 @@ is ------------------------------------------------------------------------- - procedure Init - (Result : out Tkmrpc.Results.Result_Type; - Address : Interfaces.C.Strings.chars_ptr) + procedure Init (Address : Interfaces.C.Strings.chars_ptr) is Path : constant String := Interfaces.C.Strings.Value (Address); begin Sock.Init; Sock.Bind (Path => Anet.Sockets.Unix.Path_Type (Path)); Receiver.Listen (Callback => Dispatch'Access); - - Result := Tkmrpc.Results.Ok; - - exception - when others => - Result := Tkmrpc.Results.Invalid_Operation; end Init; end Esa_Event_Service; diff --git a/src/charon-tkm/src/ees/esa_event_service.ads b/src/charon-tkm/src/ees/esa_event_service.ads index 5ead0ca0c..f3630b7ac 100644 --- a/src/charon-tkm/src/ees/esa_event_service.ads +++ b/src/charon-tkm/src/ees/esa_event_service.ads @@ -16,16 +16,11 @@ with Interfaces.C.Strings; -with Tkmrpc.Results; - package Esa_Event_Service is - procedure Init - (Result : out Tkmrpc.Results.Result_Type; - Address : Interfaces.C.Strings.chars_ptr); + procedure Init (Address : Interfaces.C.Strings.chars_ptr); pragma Export (C, Init, "ees_server_init"); - pragma Export_Valued_Procedure (Init); -- Initialize Esa Event Service (EES) with given address. procedure Finalize; diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c index ce4cedcbc..47e1eb963 100644 --- a/src/charon-tkm/src/tkm/tkm.c +++ b/src/charon-tkm/src/tkm/tkm.c @@ -69,12 +69,8 @@ bool tkm_init() tkmlib_final(); return FALSE; } - /* init esa event service */ - if (ees_server_init(EES_SOCKET) != TKM_OK) - { - tkmlib_final(); - return FALSE; - } + + ees_server_init(EES_SOCKET); if (ike_tkm_reset() != TKM_OK) { |