From 6fdd8a5a2230743efb1d65988878b0df2ae9dbdf Mon Sep 17 00:00:00 2001 From: Emre Ucan Date: Fri, 10 Jul 2015 15:45:40 +0200 Subject: ilmClient: ilmClient_destroy return error it makes to return, if the destroy call was successful. Signed-off-by: Emre Ucan --- ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h | 2 +- ivi-layermanagement-api/ilmClient/src/ilm_client.c | 4 ++-- .../ilmClient/src/ilm_client_wayland_platform.c | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'ivi-layermanagement-api') diff --git a/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h b/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h index a252e3b..1fb10af 100644 --- a/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h +++ b/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h @@ -32,7 +32,7 @@ typedef struct _ILM_CLIENT_PLATFORM_FUNC ilmPixelFormat pixelFormat, t_ilm_surface* pSurfaceId); ilmErrorTypes (*surfaceRemove)(const t_ilm_surface surfaceId); ilmErrorTypes (*init)(t_ilm_nativedisplay nativedisplay); - void (*destroy)(); + ilmErrorTypes (*destroy)(); } ILM_CLIENT_PLATFORM_FUNC; ILM_CLIENT_PLATFORM_FUNC gIlmClientPlatformFunc; diff --git a/ivi-layermanagement-api/ilmClient/src/ilm_client.c b/ivi-layermanagement-api/ilmClient/src/ilm_client.c index 6c0c4ef..ddaf1ea 100644 --- a/ivi-layermanagement-api/ilmClient/src/ilm_client.c +++ b/ivi-layermanagement-api/ilmClient/src/ilm_client.c @@ -42,10 +42,10 @@ ilmClient_init(t_ilm_nativedisplay nativedisplay) return gIlmClientPlatformFunc.init(nativedisplay); } -ILM_EXPORT void +ILM_EXPORT ilmErrorTypes ilmClient_destroy(void) { - gIlmClientPlatformFunc.destroy(); + return gIlmClientPlatformFunc.destroy(); } ILM_EXPORT ilmErrorTypes diff --git a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c index 3b919cf..785582d 100644 --- a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c +++ b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c @@ -33,7 +33,7 @@ static ilmErrorTypes wayland_surfaceCreate(t_ilm_nativehandle nativehandle, t_ilm_surface* pSurfaceId); static ilmErrorTypes wayland_surfaceRemove(const t_ilm_surface surfaceId); static ilmErrorTypes wayland_init(t_ilm_nativedisplay nativedisplay); -static void wayland_destroy(void); +static ilmErrorTypes wayland_destroy(void); void init_ilmClientPlatformTable(void) { @@ -133,7 +133,7 @@ static struct ilm_client_context ilm_context = {0}; static void destroy_client_resouses(void); -static void +static ilmErrorTypes wayland_destroy(void) { struct ilm_client_context *ctx = &ilm_context; @@ -141,7 +141,10 @@ wayland_destroy(void) { destroy_client_resouses(); ctx->valid = 0; + } + + return ILM_SUCCESS; } static void -- cgit v1.2.1