From fdeef8e6ddee74190346c640a02d259981b33c8a Mon Sep 17 00:00:00 2001 From: Pavel Grunt Date: Thu, 17 Mar 2016 11:19:32 +0100 Subject: usb-acl-helper: Remove extra check for NULL g_cancellable_cancel() and g_clear_object() can handle it Acked-by: Victor Toso --- src/spice-client-glib-usb-acl-helper.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/spice-client-glib-usb-acl-helper.c b/src/spice-client-glib-usb-acl-helper.c index 3c5de05..20d1558 100644 --- a/src/spice-client-glib-usb-acl-helper.c +++ b/src/spice-client-glib-usb-acl-helper.c @@ -150,8 +150,7 @@ out: static void cleanup(void) { - if (polkit_cancellable) - g_cancellable_cancel(polkit_cancellable); + g_cancellable_cancel(polkit_cancellable); if (state == STATE_WAITING_FOR_STDIN_EOF) set_facl(path, getuid(), 0); @@ -361,8 +360,7 @@ int main(void) g_main_loop_run(loop); - if (polkit_cancellable) - g_clear_object(&polkit_cancellable); + g_clear_object(&polkit_cancellable); g_object_unref(stdin_stream); g_object_unref(authority); g_object_unref(subject); -- cgit