Remove result out parameter from EES Init

Error processing is done by the registered exception handler.

diff --git a/src/charon-tkm/src/ees/esa_event_service.adb b/src/charon-tkm/src/ees/esa_event_service.adb
index 7b35090afdce675b6d1b8dc8ad996265b3313ed7..5b5d7003bdad5c3db93f46c5aadcf03bceb18f33 100644 (file)
--- 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 5ead0ca0c10d63c31d7abf372b517dd4f049ef13..f3630b7ac12c873ae171ad2032f45379299f5703 100644 (file)
--- 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 ce4cedcbcef248fb92584d23fc29390ea1a414f6..47e1eb96319bdc4fa90ce02386ea2b2c906ce59c 100644 (file)
--- 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)
        {