Reduce duplicate code to check eclient

Change-Id: Idad3a4a999628708dcc15ca46dbcff920d721658
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 6452a5c..e6c5401 100644 (file)
--- a/src/e_mod_input_panel.c
+++ b/src/e_mod_input_panel.c
@@ -15,6 +15,15 @@
         return; \
      }
 
+#define CHECK_ECLIENT(ec, resource) \
+   if (!ec) \
+     { \
+        WTI_WARNING(resource, \
+                    WL_DISPLAY_ERROR_INVALID_OBJECT, \
+                    "No Client For Input Panel 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;
@@ -694,14 +703,8 @@ _e_input_panel_surface_unmap(struct wl_resource *resource)
    E_Client *ec = NULL;
 
    CHECK_INPUT_PANEL_SURFACE(ips);
-
-   if (!(ec = ips->ec))
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Client For Input Panel Surface");
-        return;
-     }
+   ec = ips->ec;
+   CHECK_ECLIENT(ec, resource);
 
    if (!ec->comp_data)
      {
@@ -979,17 +982,11 @@ _e_input_panel_cb_surface_get(struct wl_client *client, struct wl_resource *reso
      {
         WTI_WARNING(resource,
                     WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Input Panel Surface For Surface");
+                    "No Input Panel For Surface");
         return;
      }
 
-   if (!ec)
-     {
-        WTI_WARNING(surface_resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No E_Client Set On Surface");
-        return;
-     }
+   CHECK_ECLIENT(ec, surface_resource);
 
    if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL)
      return;