From 29263d13a40d6ad78644c558f16cf1f8e64f466f Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Wed, 16 Aug 2023 16:42:40 +0900 Subject: [PATCH] e_hwc_window: clean up _e_hwc_window_free remove unnecessary checking null and goto Change-Id: Ib490361e875bf30b614e3959952cb51a7d04589a --- src/bin/e_hwc_window.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index 2058618..f907120 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -536,24 +536,17 @@ _e_hwc_window_free(E_Hwc_Window *hwc_window) { E_Hwc *hwc; Hwc_Window_Prop *prop; - E_Output *output; - tdm_output *toutput; - hwc = hwc_window->hwc; - EINA_SAFETY_ON_NULL_GOTO(hwc, done); + EHWINF("Free", NULL, hwc_window->hwc, hwc_window); - hwc->hwc_windows = eina_list_remove(hwc->hwc_windows, hwc_window); + hwc = hwc_window->hwc; + if (hwc) + hwc->hwc_windows = eina_list_remove(hwc->hwc_windows, hwc_window); e_presentation_time_container_finish(&hwc_window->presentation_container); e_hwc_presentation_callback_list_finish(&hwc_window->pending_presentation_callbacks); e_hwc_presentation_callback_list_finish(&hwc_window->presentation_callbacks); - output = hwc->output; - EINA_SAFETY_ON_NULL_GOTO(hwc->output, done); - - toutput = output->toutput; - EINA_SAFETY_ON_NULL_GOTO(toutput, done); - if(hwc_window->prop_list) { EINA_LIST_FREE(hwc_window->prop_list, prop) @@ -570,9 +563,6 @@ _e_hwc_window_free(E_Hwc_Window *hwc_window) NULL, NULL); - EHWINF("Free", NULL, hwc_window->hwc, hwc_window); - -done: if (hwc_window->cursor_buffer_destroy_listener.notify) { wl_list_remove(&hwc_window->cursor_buffer_destroy_listener.link); -- 2.7.4