From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Wed, 22 Jun 2022 04:28:33 +0000 (+0900)
Subject: Reduce duplicated code
X-Git-Tag: submit/tizen/20220628.013934~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F276618%2F2;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-wl-textinput.git

Reduce duplicated code

Change-Id: I22b55e0d5b072626de305303bf8e711ffe0193e3
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
---

diff --git a/src/e_mod_input_panel.c b/src/e_mod_input_panel.c
index a14bc2f..6452a5c 100644
--- a/src/e_mod_input_panel.c
+++ b/src/e_mod_input_panel.c
@@ -8,6 +8,13 @@
 #define WTI_WARNING(resource, code, msg)     (_e_input_panel_log_show((resource), (code), (msg), __func__))
 #define WAIT_UPDATE_TIMER_INTERVAL 2.0f
 
+#define CHECK_INPUT_PANEL_SURFACE(ips) \
+   if (!ips) \
+     { \
+        WTI_WARNING(resource, WL_DISPLAY_ERROR_INVALID_OBJECT, "No Input Panel Surface For Surface"); \
+        return; \
+     }
+
 typedef struct _E_Input_Panel E_Input_Panel;
 typedef struct _E_Input_Panel_Surface E_Input_Panel_Surface;
 typedef struct _E_Input_Panel_Floating_Info E_Input_Panel_Floating_Info;
@@ -195,13 +202,7 @@ _e_input_panel_surface_cb_toplevel_set(struct wl_client *client EINA_UNUSED, str
    E_Input_Panel_Surface *ips = wl_resource_get_user_data(resource);
    E_Input_Panel *input_panel = NULL;
 
-   if (!ips)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Input Panel Surface For Surface");
-        return;
-     }
+   CHECK_INPUT_PANEL_SURFACE(ips);
 
    if (!(input_panel = ips->input_panel)) return;
 
@@ -220,13 +221,7 @@ _e_input_panel_surface_cb_overlay_panel_set(struct wl_client *client EINA_UNUSED
    E_Input_Panel_Surface *ips = wl_resource_get_user_data(resource);
    E_Input_Panel *input_panel = NULL;
 
-   if (!ips)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Input Panel Surface For Surface");
-        return;
-     }
+   CHECK_INPUT_PANEL_SURFACE(ips);
 
    if (!(input_panel = ips->input_panel)) return;
 
@@ -318,13 +313,7 @@ _e_input_panel_surface_cb_ready_set(struct wl_client *client EINA_UNUSED, struct
 
    if (!g_input_panel) return;
 
-   if (!ips)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Input Panel Surface For Surface");
-        return;
-     }
+   CHECK_INPUT_PANEL_SURFACE(ips);
 
    LOGI("IPS::SHOW::READY\n");
 
@@ -348,13 +337,7 @@ _e_input_panel_surface_resource_destroy(struct wl_resource *resource)
    E_Input_Panel *input_panel = NULL;
    E_Client *ec = NULL;
 
-   if (!ips)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Input Panel Surface For Surface");
-        return;
-     }
+   CHECK_INPUT_PANEL_SURFACE(ips);
 
    if (!(input_panel = ips->input_panel)) return;
 
@@ -653,16 +636,10 @@ _e_input_panel_surface_visible_update(E_Input_Panel_Surface *ips)
 static void
 _e_input_panel_surface_configure(struct wl_resource *resource, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED, Evas_Coord w, Evas_Coord h)
 {
-   E_Input_Panel_Surface *ips;
+   E_Input_Panel_Surface *ips  = wl_resource_get_user_data(resource);
    E_Client *ec;
 
-   if (!(ips = wl_resource_get_user_data(resource)))
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Input Panel Surface For Surface");
-        return;
-     }
+   CHECK_INPUT_PANEL_SURFACE(ips);
 
    if (!(ec = ips->ec))
      {
@@ -681,16 +658,10 @@ _e_input_panel_surface_configure(struct wl_resource *resource, Evas_Coord x EINA
 static void
 _e_input_panel_surface_map(struct wl_resource *resource)
 {
-   E_Input_Panel_Surface *ips;
+   E_Input_Panel_Surface *ips  = wl_resource_get_user_data(resource);
    E_Client *ec;
 
-   if (!(ips = wl_resource_get_user_data(resource)))
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Input Panel Surface For Surface");
-        return;
-     }
+   CHECK_INPUT_PANEL_SURFACE(ips);
 
    if (!(ec = ips->ec))
      {
@@ -719,16 +690,10 @@ _e_input_panel_surface_map(struct wl_resource *resource)
 static void
 _e_input_panel_surface_unmap(struct wl_resource *resource)
 {
-   E_Input_Panel_Surface *ips = NULL;
+   E_Input_Panel_Surface *ips = wl_resource_get_user_data(resource);
    E_Client *ec = NULL;
 
-   if (!(ips = wl_resource_get_user_data(resource)))
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Input Panel Surface For Surface");
-        return;
-     }
+   CHECK_INPUT_PANEL_SURFACE(ips);
 
    if (!(ec = ips->ec))
      {
@@ -1686,4 +1651,4 @@ Eina_Bool e_input_panel_floating_mode_get()
      }
 
    return ret;
-}
\ No newline at end of file
+}