From 2ed2c64ab12fbe77a3b6f8d8871e746f2f51330e Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 14 Dec 2023 11:31:29 +0900 Subject: [PATCH] e_desk_area: check the parameters Change-Id: I1d716881401c36a931750f9c27e9f2efeaa424cc --- src/bin/e_desk_area.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c index 652f00f..21aba6c 100644 --- a/src/bin/e_desk_area.c +++ b/src/bin/e_desk_area.c @@ -633,7 +633,8 @@ e_desk_area_name_get(E_Desk_Area *eda) E_API Eina_Bool e_desk_area_geometry_set(E_Desk_Area *eda, int x, int y, int w, int h) { - if (!eda) return EINA_FALSE; + E_OBJECT_CHECK_RETURN(eda, EINA_FALSE); + E_OBJECT_TYPE_CHECK_RETURN(eda, E_DESK_AREA_TYPE, EINA_FALSE); _e_desk_geometry_info_set(eda, x, y, w, h); @@ -643,7 +644,8 @@ e_desk_area_geometry_set(E_Desk_Area *eda, int x, int y, int w, int h) E_API Eina_Bool e_desk_area_geometry_get(E_Desk_Area *eda, int *x, int *y, int *w, int *h) { - if (!eda) return EINA_FALSE; + E_OBJECT_CHECK_RETURN(eda, EINA_FALSE); + E_OBJECT_TYPE_CHECK_RETURN(eda, E_DESK_AREA_TYPE, EINA_FALSE); if (x) *x = eda->x; if (y) *y = eda->y; @@ -654,18 +656,21 @@ e_desk_area_geometry_get(E_Desk_Area *eda, int *x, int *y, int *w, int *h) } EINTERN Eina_Bool -e_desk_area_layer_set(E_Desk_Area *eda, E_Desk_Area_Layer layer) +e_desk_area_layer_set(E_Desk_Area *eda, E_Desk_Area_Layer eda_layer) { - if (!eda) return EINA_FALSE; + E_OBJECT_CHECK_RETURN(eda, EINA_FALSE); + E_OBJECT_TYPE_CHECK_RETURN(eda, E_DESK_AREA_TYPE, EINA_FALSE); + + eda->layer = eda_layer; - eda->layer = layer; return EINA_TRUE; } E_API E_Desk_Area_Layer e_desk_area_layer_get(E_Desk_Area *eda) { - if (!eda) return E_DESK_AREA_LAYER_NORMAL; + E_OBJECT_CHECK_RETURN(eda, E_DESK_AREA_LAYER_NORMAL); + E_OBJECT_TYPE_CHECK_RETURN(eda, E_DESK_AREA_TYPE, E_DESK_AREA_LAYER_NORMAL); return eda->layer; } @@ -871,6 +876,8 @@ e_desk_area_ec_remove(E_Desk_Area *eda, E_Client *ec) E_FREE(eda_client); #else + E_Desk_Area_Client_Layer edgc_layer; + edgc_layer = e_client_desk_area_client_layer_get(ec); if (!_check_desk_area_client_layer_validation(edgc_layer)) return; -- 2.7.4