From fc1532efc4323cf0103ba320be450a0ed2cd2ef6 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 22 Jun 2024 14:39:21 +0200 Subject: [PATCH] Remove unused variables Detected through codeql Part-of: (cherry picked from commit 6e1c76133040ea5d4b2b56fcc9c96f671122d3f0) --- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 1 - cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 1 - src/backends/native/meta-onscreen-native.c | 1 - src/backends/native/meta-renderer-native.c | 1 - src/backends/native/meta-thread.c | 1 - src/core/window.c | 1 - src/tests/color-management-profile-conflict-test.c | 1 - src/tests/color-management-tests.c | 2 -- src/tests/input-capture-tests.c | 3 --- src/tests/meta-backend-test.c | 1 - src/tests/native-thread.c | 2 -- src/tests/service-channel-tests.c | 1 - src/tests/wayland-client-tests.c | 1 - src/tests/wayland-x11-interop-tests.c | 1 - src/tests/xwayland-tests.c | 1 - src/wayland/meta-wayland-data-device-primary.c | 2 -- src/wayland/meta-wayland-data-device.c | 2 -- src/wayland/meta-wayland-input.c | 8 +------- 18 files changed, 1 insertion(+), 30 deletions(-) diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c index a5bcd53bd..dc03a9e17 100644 --- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c +++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c @@ -55,7 +55,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back) cogl_framebuffer_driver_get_framebuffer (driver); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglFramebufferBits *bits = &gl_framebuffer_back->bits; - g_autoptr (GError) error = NULL; if (!gl_framebuffer_back->dirty_bitmasks) return TRUE; diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c index 6880e4aff..597a1e0f6 100644 --- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c +++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c @@ -65,7 +65,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo) cogl_framebuffer_driver_get_framebuffer (driver); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglFramebufferBits *bits = &gl_framebuffer_fbo->bits; - g_autoptr (GError) error = NULL; if (!gl_framebuffer_fbo->dirty_bitmasks) return TRUE; diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c index 473a05a7e..74ab9bd94 100644 --- a/src/backends/native/meta-onscreen-native.c +++ b/src/backends/native/meta-onscreen-native.c @@ -2127,7 +2127,6 @@ choose_onscreen_egl_config (CoglOnscreen *onscreen, MetaCrtcKms *crtc_kms = META_CRTC_KMS (onscreen_native->crtc); MetaKmsPlane *kms_plane = meta_crtc_kms_get_assigned_primary_plane (crtc_kms); EGLint attrs[MAX_EGL_CONFIG_ATTRIBS]; - g_autoptr (GError) local_error = NULL; static const uint32_t alphaless_10bpc_formats[] = { GBM_FORMAT_XRGB2101010, GBM_FORMAT_XBGR2101010, diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c index aa76d018c..2fcf6dfd5 100644 --- a/src/backends/native/meta-renderer-native.c +++ b/src/backends/native/meta-renderer-native.c @@ -2172,7 +2172,6 @@ meta_renderer_native_unset_modes (MetaRendererNative *renderer_native) MetaKmsDevice *kms_device = meta_gpu_kms_get_kms_device (META_GPU_KMS (gpu)); GList *k; - g_autoptr (MetaKmsFeedback) kms_feedback = NULL; MetaKmsUpdate *kms_update = NULL; for (k = meta_gpu_get_crtcs (gpu); k; k = k->next) diff --git a/src/backends/native/meta-thread.c b/src/backends/native/meta-thread.c index 08bd9b8fe..4287d3d83 100644 --- a/src/backends/native/meta-thread.c +++ b/src/backends/native/meta-thread.c @@ -765,7 +765,6 @@ meta_thread_reset_thread_type (MetaThread *thread, MetaThreadType thread_type) { MetaThreadPrivate *priv = meta_thread_get_instance_private (thread); - g_autoptr (GMainContext) thread_context = NULL; if (priv->thread_type == thread_type) return; diff --git a/src/core/window.c b/src/core/window.c index d0126b1b2..b8bf88e07 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -6851,7 +6851,6 @@ meta_window_get_unit_cgroup (MetaWindow *window) g_autofree char *contents = NULL; g_autofree char *complete_path = NULL; g_autofree char *unit_name = NULL; - g_autofree char *unit_path = NULL; char *unit_end; pid_t pid; diff --git a/src/tests/color-management-profile-conflict-test.c b/src/tests/color-management-profile-conflict-test.c index 222d50f41..7f39b891d 100644 --- a/src/tests/color-management-profile-conflict-test.c +++ b/src/tests/color-management-profile-conflict-test.c @@ -35,7 +35,6 @@ get_colord_mock_proxy (void) { GDBusProxy *proxy; g_autoptr (GError) error = NULL; - g_autoptr (GVariant) ret = NULL; proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, diff --git a/src/tests/color-management-tests.c b/src/tests/color-management-tests.c index ee3089d1e..18f289497 100644 --- a/src/tests/color-management-tests.c +++ b/src/tests/color-management-tests.c @@ -126,7 +126,6 @@ get_colord_mock_proxy (void) { GDBusProxy *proxy; g_autoptr (GError) error = NULL; - g_autoptr (GVariant) ret = NULL; proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, @@ -259,7 +258,6 @@ get_gsd_color_mock_proxy (void) { GDBusProxy *proxy; g_autoptr (GError) error = NULL; - g_autoptr (GVariant) ret = NULL; proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, diff --git a/src/tests/input-capture-tests.c b/src/tests/input-capture-tests.c index 0a066f7d8..b885f4908 100644 --- a/src/tests/input-capture-tests.c +++ b/src/tests/input-capture-tests.c @@ -318,7 +318,6 @@ meta_test_input_capture_clear_barriers (void) MetaBackend *backend = meta_context_get_backend (test_context); ClutterSeat *seat = meta_backend_get_default_seat (backend); g_autoptr (MetaVirtualMonitor) virtual_monitor1 = NULL; - g_autoptr (MetaVirtualMonitor) virtual_monitor2 = NULL; g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; InputCaptureTestClient *test_client; @@ -436,7 +435,6 @@ meta_test_input_capture_events (void) MetaBackend *backend = meta_context_get_backend (test_context); ClutterSeat *seat = meta_backend_get_default_seat (backend); g_autoptr (MetaVirtualMonitor) virtual_monitor1 = NULL; - g_autoptr (MetaVirtualMonitor) virtual_monitor2 = NULL; g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; g_autoptr (ClutterVirtualInputDevice) virtual_keyboard = NULL; InputCaptureTestClient *test_client; @@ -595,7 +593,6 @@ main (int argc, char **argv) { g_autoptr (MetaContext) context = NULL; - g_autoptr (GError) error = NULL; g_assert_cmpstr (getenv ("GSETTINGS_BACKEND"), ==, "memory"); diff --git a/src/tests/meta-backend-test.c b/src/tests/meta-backend-test.c index 0280347b6..cf2929ec6 100644 --- a/src/tests/meta-backend-test.c +++ b/src/tests/meta-backend-test.c @@ -100,7 +100,6 @@ meta_backend_test_add_test_device (MetaBackendTest *backend_test, ClutterInputDeviceType device_type, int n_buttons) { - g_autoptr (GList) devices = NULL; MetaBackend *backend = META_BACKEND (backend_test); ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend); ClutterSeat *seat = clutter_backend_get_default_seat (clutter_backend); diff --git a/src/tests/native-thread.c b/src/tests/native-thread.c index abe944b6e..54482ca1d 100644 --- a/src/tests/native-thread.c +++ b/src/tests/native-thread.c @@ -1147,7 +1147,6 @@ assert_realtime (MetaThreadImpl *thread_impl, GError **error) { g_autoptr (GVariant) ret = NULL; - g_autoptr (GVariant) priority_variant = NULL; uint32_t priority = 0; g_assert_true (meta_thread_impl_is_realtime (thread_impl)); @@ -1196,7 +1195,6 @@ assert_no_realtime (MetaThreadImpl *thread_impl, GError **error) { g_autoptr (GVariant) ret = NULL; - g_autoptr (GVariant) priority_variant = NULL; uint32_t priority = UINT32_MAX; g_assert_false (meta_thread_impl_is_realtime (thread_impl)); diff --git a/src/tests/service-channel-tests.c b/src/tests/service-channel-tests.c index fc7e9d92d..16b4ae507 100644 --- a/src/tests/service-channel-tests.c +++ b/src/tests/service-channel-tests.c @@ -93,7 +93,6 @@ main (int argc, char **argv) { g_autoptr (MetaContext) context = NULL; - g_autoptr (GError) error = NULL; context = meta_create_test_context (META_CONTEXT_TEST_TYPE_HEADLESS, META_CONTEXT_TEST_FLAG_NO_X11); diff --git a/src/tests/wayland-client-tests.c b/src/tests/wayland-client-tests.c index a2231187a..36d7af6db 100644 --- a/src/tests/wayland-client-tests.c +++ b/src/tests/wayland-client-tests.c @@ -168,7 +168,6 @@ main (int argc, char **argv) { g_autoptr (MetaContext) context = NULL; - g_autoptr (GError) error = NULL; context = meta_create_test_context (META_CONTEXT_TEST_TYPE_HEADLESS, META_CONTEXT_TEST_FLAG_NO_X11); diff --git a/src/tests/wayland-x11-interop-tests.c b/src/tests/wayland-x11-interop-tests.c index 6141bb79d..14a7f89d4 100644 --- a/src/tests/wayland-x11-interop-tests.c +++ b/src/tests/wayland-x11-interop-tests.c @@ -275,7 +275,6 @@ main (int argc, char **argv) { g_autoptr (MetaContext) context = NULL; - g_autoptr (GError) error = NULL; context = meta_create_test_context (META_CONTEXT_TEST_TYPE_HEADLESS, META_CONTEXT_TEST_FLAG_TEST_CLIENT); diff --git a/src/tests/xwayland-tests.c b/src/tests/xwayland-tests.c index 982ef9625..5c8c6321b 100644 --- a/src/tests/xwayland-tests.c +++ b/src/tests/xwayland-tests.c @@ -320,7 +320,6 @@ main (int argc, char **argv) { g_autoptr (MetaContext) context = NULL; - g_autoptr (GError) error = NULL; context = test_context = meta_create_test_context (META_CONTEXT_TEST_TYPE_HEADLESS, diff --git a/src/wayland/meta-wayland-data-device-primary.c b/src/wayland/meta-wayland-data-device-primary.c index c4831ea0e..52824e685 100644 --- a/src/wayland/meta-wayland-data-device-primary.c +++ b/src/wayland/meta-wayland-data-device-primary.c @@ -175,7 +175,6 @@ primary_device_set_selection (struct wl_client *client, uint32_t serial) { MetaWaylandDataDevicePrimary *data_device = wl_resource_get_user_data (resource); - MetaWaylandSeat *seat = wl_container_of (data_device, seat, primary_data_device); MetaWaylandDataSource *source = NULL; if (source_resource) @@ -343,7 +342,6 @@ void meta_wayland_data_device_primary_set_focus (MetaWaylandDataDevicePrimary *data_device, MetaWaylandSurface *surface) { - MetaWaylandSeat *seat = wl_container_of (data_device, seat, primary_data_device); struct wl_client *focus_client = NULL; struct wl_resource *data_device_resource; diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c index 442e6769b..5d650d8c0 100644 --- a/src/wayland/meta-wayland-data-device.c +++ b/src/wayland/meta-wayland-data-device.c @@ -1048,7 +1048,6 @@ data_device_set_selection (struct wl_client *client, uint32_t serial) { MetaWaylandDataDevice *data_device = wl_resource_get_user_data (resource); - MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device); MetaWaylandDataSource *source; if (source_resource) @@ -1250,7 +1249,6 @@ void meta_wayland_data_device_set_focus (MetaWaylandDataDevice *data_device, MetaWaylandSurface *surface) { - MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device); struct wl_client *focus_client = NULL; struct wl_resource *data_device_resource; diff --git a/src/wayland/meta-wayland-input.c b/src/wayland/meta-wayland-input.c index b1c91f25d..44490ee19 100644 --- a/src/wayland/meta-wayland-input.c +++ b/src/wayland/meta-wayland-input.c @@ -337,13 +337,7 @@ meta_wayland_input_detach_event_handler (MetaWaylandInput *input, wl_list_remove (&handler->link); if (handler_change && !wl_list_empty (&input->event_handler_list)) - { - MetaWaylandEventHandler *head = - wl_container_of (input->event_handler_list.next, - head, link); - - meta_wayland_input_invalidate_all_focus (input); - } + meta_wayland_input_invalidate_all_focus (input); if (input->grab && !should_be_grabbed (input)) {