e_client: check if private of client is null

Change-Id: Idab8215d663f14806638b606e889644f859e8392

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 94d2fc8..205df58 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -22,11 +22,13 @@
 
 #define API_ENTRY \
    EINA_SAFETY_ON_NULL_RETURN(ec); \
-   E_Client_Private *priv = PRI(ec)
+   E_Client_Private *priv = PRI(ec); \
+   EINA_SAFETY_ON_NULL_RETURN(priv);
 
 #define API_ENTRY_VAL(ret) \
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, ret); \
-   E_Client_Private *priv = PRI(ec)
+   E_Client_Private *priv = PRI(ec); \
+   EINA_SAFETY_ON_NULL_RETURN_VAL(priv, ret);
 
 typedef struct _E_Client_Private E_Client_Private;
 
@@ -3744,14 +3746,13 @@ E_API E_Client *
 e_client_above_get(const E_Client *ec)
 {
 #ifdef REFACTOR_DESK_AREA
-   E_Client_Data_Get_Above data;
+   API_ENTRY_VAL(NULL);
 
-   E_OBJECT_CHECK_RETURN(ec, NULL);
-   E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, NULL);
+   E_Client_Data_Get_Above data;
 
    data.above_ec = NULL;
 
-   wl_signal_emit_mutable(&PRI(ec)->events.get_above, &data);
+   wl_signal_emit_mutable(&priv->events.get_above, &data);
 
    return data.above_ec;
 #else
@@ -3805,14 +3806,13 @@ E_API E_Client *
 e_client_below_get(const E_Client *ec)
 {
 #ifdef REFACTOR_DESK_AREA
-   E_Client_Data_Get_Below data;
+   API_ENTRY_VAL(NULL);
 
-   E_OBJECT_CHECK_RETURN(ec, NULL);
-   E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, NULL);
+   E_Client_Data_Get_Below data;
 
    data.below_ec = NULL;
 
-   wl_signal_emit_mutable(&PRI(ec)->events.get_below, &data);
+   wl_signal_emit_mutable(&priv->events.get_below, &data);
 
    return data.below_ec;
 #else
@@ -3893,14 +3893,13 @@ EINTERN E_Client *
 e_client_visible_above_get(E_Client *ec)
 {
 #ifdef REFACTOR_DESK_AREA
-   E_Client_Data_Get_Visible_Above data;
+   API_ENTRY_VAL(NULL);
 
-   E_OBJECT_CHECK_RETURN(ec, NULL);
-   E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, NULL);
+   E_Client_Data_Get_Visible_Above data;
 
    data.above_ec = NULL;
 
-   wl_signal_emit_mutable(&PRI(ec)->events.get_visible_above, &data);
+   wl_signal_emit_mutable(&priv->events.get_visible_above, &data);
 
    return data.above_ec;
 #else
@@ -3947,14 +3946,13 @@ EINTERN E_Client *
 e_client_visible_below_get(E_Client *ec)
 {
 #ifdef REFACTOR_DESK_AREA
-   E_Client_Data_Get_Visible_Below data;
+   API_ENTRY_VAL(NULL);
 
-   E_OBJECT_CHECK_RETURN(ec, NULL);
-   E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, NULL);
+   E_Client_Data_Get_Visible_Below data;
 
    data.below_ec = NULL;
 
-   wl_signal_emit_mutable(&PRI(ec)->events.get_visible_below, &data);
+   wl_signal_emit_mutable(&priv->events.get_visible_below, &data);
 
    return data.below_ec;
 #else