usb-acl-helper: Simplify cb_watch_outgtask

Since spice_usb_acl_helper_cleanup() only cancels the task in the case
where it has not yet been completed, it is fine to call this in the
success case as well as the failure case. Also, since _cleanup() already
clears the priv->task member, there's no need to clear it again after
calling _cleanup()

1 files changed, 1 insertions, 6 deletions

diff --git a/src/usb-acl-helper.c b/src/usb-acl-helper.c
index 705f0e9..839f23c 100644
--- a/src/usb-acl-helper.c
+++ b/src/usb-acl-helper.c
@@ -105,7 +105,6 @@ static gboolean cb_out_watch(GIOChannel    *channel,
 {
     SpiceUsbAclHelper *self = SPICE_USB_ACL_HELPER(user_data);
     SpiceUsbAclHelperPrivate *priv = self->priv;
-    gboolean success = FALSE;
     GError *err = NULL;
     GIOStatus status;
     gchar *string;
@@ -122,7 +121,6 @@ static gboolean cb_out_watch(GIOChannel    *channel,
         case G_IO_STATUS_NORMAL:
             string[strlen(string) - 1] = 0;
             if (!strcmp(string, "SUCCESS")) {
-                success = TRUE;
                 g_task_return_boolean(priv->task, TRUE);
             } else if (!strcmp(string, "CANCELED")) {
                 async_result_set_cancelled(priv->task);
@@ -146,10 +144,7 @@ static gboolean cb_out_watch(GIOChannel    *channel,
             return TRUE; /* Wait for more input */
     }
 
-    if (!success)
-        spice_usb_acl_helper_cleanup(self);
-
-    g_clear_object(&priv->task);
+    spice_usb_acl_helper_cleanup(self);
 
 done:
     g_object_unref(self);