e_comp_wl: change code not to use EINA_SAFETY checker in getting E_APIs

Change-Id: I96455af6f193b0d731b0b9c06a1a27e5da89ba53

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index 608ed97..065d071 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -4433,7 +4433,7 @@ e_comp_wl_touch_cancel(void)
 E_API Eina_Bool
 e_comp_wl_data_check(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
+   if (!ec) return EINA_FALSE;
 
    return ec->comp_data ? EINA_TRUE : EINA_FALSE;
 }
@@ -4441,8 +4441,8 @@ e_comp_wl_data_check(E_Client *ec)
 E_API Eina_Bool
 e_comp_wl_aux_hint_changed_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, EINA_FALSE);
+   if (!ec) return EINA_FALSE;
+   if (!ec->comp_data) return EINA_FALSE;
 
    return ec->comp_data->aux_hint.changed;
 }
@@ -4450,12 +4450,11 @@ e_comp_wl_aux_hint_changed_get(E_Client *ec)
 E_API E_Comp_Wl_Buffer *
 e_comp_wl_buffer_ref_buffer_get(E_Client *ec)
 {
-   E_Surface *surface;
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
+   if (!ec) return NULL;
 
+   E_Surface *surface;
    surface = e_surface_try_from_ec(ec);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(surface, NULL);
+   if (!surface) return NULL;
 
    return e_surface_buffer_try_get(surface);
 }
@@ -4472,8 +4471,8 @@ e_comp_wl_mapped_set(E_Client *ec, Eina_Bool mapped)
 E_API Eina_Bool
 e_comp_wl_mapped_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, EINA_FALSE);
+   if (!ec) return EINA_FALSE;
+   if (!ec->comp_data) return EINA_FALSE;
 
    return ec->comp_data->mapped;
 }
@@ -4517,8 +4516,8 @@ e_comp_wl_pending_buffer_viewport_surface_width_set(E_Client *ec, int32_t width)
 E_API E_Client *
 e_comp_wl_remote_surface_onscreen_parent_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->remote_surface.onscreen_parent;
 }
@@ -4526,8 +4525,8 @@ e_comp_wl_remote_surface_onscreen_parent_get(E_Client *ec)
 E_API E_Comp_Wl_Buffer_Viewport *
 e_comp_wl_scaler_buffer_viewport_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return &ec->comp_data->scaler.buffer_viewport;
 }
@@ -4535,12 +4534,11 @@ e_comp_wl_scaler_buffer_viewport_get(E_Client *ec)
 E_API int32_t
 e_comp_wl_scaler_buffer_viewport_buffer_scale_get(E_Client *ec)
 {
-   E_Surface *surface;
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, 0);
+   if (!ec) return 0;
 
+   E_Surface *surface;
    surface = e_surface_try_from_ec(ec);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(surface, 0);
+   if (!surface) return 0;
 
    return e_surface_buffer_scale_get(surface);
 }
@@ -4557,8 +4555,8 @@ e_comp_wl_scaler_buffer_viewport_buffer_src_width_set(E_Client *ec, wl_fixed_t w
 E_API uint32_t
 e_comp_wl_scaler_buffer_viewport_buffer_transform_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, 0);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, 0);
+   if (!ec) return 0;
+   if (!ec->comp_data) return 0;
 
    return ec->comp_data->scaler.buffer_viewport.buffer.transform;
 }
@@ -4584,8 +4582,8 @@ e_comp_wl_scaler_buffer_viewport_surface_width_set(E_Client *ec, int32_t width)
 E_API struct wl_resource *
 e_comp_wl_scaler_viewport_resource_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->scaler.viewport;
 }
@@ -4602,8 +4600,8 @@ e_comp_wl_scaler_viewport_resource_set(E_Client *ec, struct wl_resource *resourc
 E_API E_Util_Transform *
 e_comp_wl_viewport_transform_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->viewport_transform;
 }
@@ -4611,8 +4609,8 @@ e_comp_wl_viewport_transform_get(E_Client *ec)
 E_API int
 e_comp_wl_viewport_width_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, 0);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, 0);
+   if (!ec) return 0;
+   if (!ec->comp_data) return 0;
 
    return ec->comp_data->width_from_viewport;
 }
@@ -4620,8 +4618,8 @@ e_comp_wl_viewport_width_get(E_Client *ec)
 E_API int
 e_comp_wl_viewport_height_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, 0);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, 0);
+   if (!ec) return 0;
+   if (!ec->comp_data) return 0;
 
    return ec->comp_data->height_from_viewport;
 }
@@ -4629,8 +4627,8 @@ e_comp_wl_viewport_height_get(E_Client *ec)
 E_API struct wl_signal *
 e_comp_wl_viewport_apply_signal_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return &ec->comp_data->apply_viewport_signal;
 }
@@ -4650,8 +4648,8 @@ e_comp_wl_shell_unmap(E_Client *ec)
 E_API Eina_Bool
 e_comp_wl_shell_window_size_get(E_Client *ec, int *w, int *h)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, EINA_FALSE);
+   if (!ec) return EINA_FALSE;
+   if (!ec->comp_data) return EINA_FALSE;
 
    if (w) *w = ec->comp_data->shell.window.w;
    if (h) *h = ec->comp_data->shell.window.h;
@@ -4668,8 +4666,8 @@ e_comp_wl_shell_surface_api_set(E_Client *ec, E_Comp_Wl_Shell_Surface_Api *api)
 E_API struct wl_resource *
 e_comp_wl_shell_surface_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->shell.surface;
 }
@@ -4686,8 +4684,8 @@ e_comp_wl_shell_surface_set(E_Client *ec, struct wl_resource *surface)
 E_API Eina_List *
 e_comp_wl_sub_list_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->sub.list;
 }
@@ -4695,8 +4693,8 @@ e_comp_wl_sub_list_get(E_Client *ec)
 E_API Eina_List *
 e_comp_wl_sub_below_list_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->sub.below_list;
 }
@@ -4704,8 +4702,8 @@ e_comp_wl_sub_below_list_get(E_Client *ec)
 E_API Eina_List *
 e_comp_wl_sub_below_list_pending_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->sub.below_list_pending;
 }
@@ -4713,8 +4711,8 @@ e_comp_wl_sub_below_list_pending_get(E_Client *ec)
 E_API Evas_Object *
 e_comp_wl_sub_below_object_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->sub.below_obj;
 }
@@ -4722,8 +4720,8 @@ e_comp_wl_sub_below_object_get(E_Client *ec)
 E_API E_Comp_Wl_Subsurf_Data *
 e_comp_wl_sub_data_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->sub.data;
 }
@@ -4731,9 +4729,9 @@ e_comp_wl_sub_data_get(E_Client *ec)
 E_API E_Comp_Wl_Buffer_Viewport *
 e_comp_wl_sub_data_cached_buffer_viewport_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data->sub.data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
+   if (!ec->comp_data->sub.data) return NULL;
 
    return &ec->comp_data->sub.data->cached.buffer_viewport;
 }
@@ -4775,9 +4773,9 @@ e_comp_wl_sub_data_position_set(E_Client *ec, int x, int y)
 E_API E_Client *
 e_comp_wl_sub_data_remote_surface_offscreen_parent_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data->sub.data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
+   if (!ec->comp_data->sub.data) return NULL;
 
    return ec->comp_data->sub.data->remote_surface.offscreen_parent;
 }
@@ -4791,8 +4789,8 @@ e_comp_wl_sub_data_stand_alone_get(E_Client *ec)
 E_API Eina_Bool
 e_comp_wl_is_video_client(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, EINA_FALSE);
+   if (!ec) return EINA_FALSE;
+   if (!ec->comp_data) return EINA_FALSE;
 
    return ec->comp_data->video_client;
 }
@@ -4815,8 +4813,8 @@ e_comp_wl_surface_get(E_Client *ec)
 E_API struct wl_resource *
 e_comp_wl_wl_surface_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec->comp_data, NULL);
+   if (!ec) return NULL;
+   if (!ec->comp_data) return NULL;
 
    return ec->comp_data->wl_surface;
 }