diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2024-02-19 15:35:58 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2024-02-19 17:12:12 +0100 |
| commit | 87f68e3ac11c70fa86a719be8104f5697eb90ce6 (patch) | |
| tree | bc84f320f431601a8148ee6dfe77cdafaa77fee6 | |
| parent | 8073a5dc34cc95459011e9a4d6f74b26c8f87880 (diff) | |
egismoc: Avoid gotos in init code, just handle the errors immediately
| -rw-r--r-- | libfprint/drivers/egismoc/egismoc.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/libfprint/drivers/egismoc/egismoc.c b/libfprint/drivers/egismoc/egismoc.c index e14b31b..d957830 100644 --- a/libfprint/drivers/egismoc/egismoc.c +++ b/libfprint/drivers/egismoc/egismoc.c @@ -1386,7 +1386,6 @@ egismoc_dev_init_handler (FpiSsm *ssm, G_USB_DEVICE_REQUEST_TYPE_VENDOR, G_USB_DEVICE_RECIPIENT_DEVICE, 32, 0x0000, 4, 16); - goto send_control; break; case DEV_INIT_CONTROL2: @@ -1395,7 +1394,6 @@ egismoc_dev_init_handler (FpiSsm *ssm, G_USB_DEVICE_REQUEST_TYPE_VENDOR, G_USB_DEVICE_RECIPIENT_DEVICE, 32, 0x0000, 4, 40); - goto send_control; break; case DEV_INIT_CONTROL3: @@ -1404,7 +1402,6 @@ egismoc_dev_init_handler (FpiSsm *ssm, G_USB_DEVICE_REQUEST_TYPE_STANDARD, G_USB_DEVICE_RECIPIENT_DEVICE, 0, 0x0000, 0, 2); - goto send_control; break; case DEV_INIT_CONTROL4: @@ -1413,7 +1410,6 @@ egismoc_dev_init_handler (FpiSsm *ssm, G_USB_DEVICE_REQUEST_TYPE_STANDARD, G_USB_DEVICE_RECIPIENT_DEVICE, 0, 0x0000, 0, 2); - goto send_control; break; case DEV_INIT_CONTROL5: @@ -1422,18 +1418,17 @@ egismoc_dev_init_handler (FpiSsm *ssm, G_USB_DEVICE_REQUEST_TYPE_VENDOR, G_USB_DEVICE_RECIPIENT_DEVICE, 82, 0x0000, 0, 8); - goto send_control; break; case DEV_GET_FW_VERSION: egismoc_exec_cmd (device, cmd_fw_version, cmd_fw_version_len, NULL, egismoc_fw_version_cb); - break; - } + return; - return; + default: + g_assert_not_reached (); + } -send_control: transfer->ssm = ssm; transfer->short_is_error = TRUE; fpi_usb_transfer_submit (g_steal_pointer (&transfer), @@ -1453,17 +1448,21 @@ egismoc_open (FpDevice *device) self->interrupt_cancellable = g_cancellable_new (); if (!g_usb_device_reset (fpi_device_get_usb_device (device), &error)) - goto error; + { + fpi_device_open_complete (device, error); + return; + } - if (!g_usb_device_claim_interface (fpi_device_get_usb_device (device), 0, 0, &error)) - goto error; + if (!g_usb_device_claim_interface (fpi_device_get_usb_device (device), + 0, 0, &error)) + { + fpi_device_open_complete (device, error); + return; + } + g_assert (self->task_ssm == NULL); self->task_ssm = fpi_ssm_new (device, egismoc_dev_init_handler, DEV_INIT_STATES); fpi_ssm_start (self->task_ssm, egismoc_dev_init_done); - return; - -error: - return fpi_device_open_complete (device, error); } static void |