mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-09-10 13:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

mafpmoc: Use consistent error handling and fix some leaks

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2026-06-18 15:49:20 +02:00
parent 14d40fb515
commit 7df9fc18cf
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libfprint/drivers/mafpmoc/mafpmoc.c
+15 -22
View File
@@ -205,7 +205,7 @@ mafp_clean_usb_bulk_in (FpDevice *device)
{ {
g_autoptr(FpiUsbTransfer) transfer = fpi_usb_transfer_new (device); g_autoptr(FpiUsbTransfer) transfer = fpi_usb_transfer_new (device);
fpi_usb_transfer_fill_bulk (transfer, MAFP_EP_BULK_IN, MAFP_USB_BUFFER_SIZE); fpi_usb_transfer_fill_bulk (transfer, MAFP_EP_BULK_IN, MAFP_USB_BUFFER_SIZE);
GError *error = NULL; g_autoptr(GError) error = NULL;
fp_dbg ("bulk clean"); fp_dbg ("bulk clean");
if (!fpi_usb_transfer_submit_sync (transfer, 200, &error)) if (!fpi_usb_transfer_submit_sync (transfer, 200, &error))
@@ -751,6 +751,7 @@ fp_enroll_get_image_cb (FpiDeviceMafpmoc *self,
mafp_cmd_response_t *resp, mafp_cmd_response_t *resp,
GError *error) GError *error)
{ {
g_autoptr(GError) local_error = NULL;
FpDevice *dev = FP_DEVICE (self); FpDevice *dev = FP_DEVICE (self);
FpEnrollState nextState = FP_ENROLL_VERIFY_GET_IMAGE; FpEnrollState nextState = FP_ENROLL_VERIFY_GET_IMAGE;
@@ -760,12 +761,9 @@ fp_enroll_get_image_cb (FpiDeviceMafpmoc *self,
return; return;
} }
if (fpi_device_action_is_cancelled (dev)) if (g_cancellable_set_error_if_cancelled (fpi_device_get_cancellable (dev),
&local_error))
{ {
GError *local_error = NULL;
g_cancellable_set_error_if_cancelled (fpi_device_get_cancellable (dev),
&local_error);
fpi_ssm_mark_failed (self->task_ssm, g_steal_pointer (&local_error)); fpi_ssm_mark_failed (self->task_ssm, g_steal_pointer (&local_error));
return; return;
} }
@@ -1096,10 +1094,9 @@ mafp_pwr_btn_shield_on_cb (FpiUsbTransfer *transfer,
static void static void
mafp_pwr_btn_shield_on (FpiDeviceMafpmoc *self, int on) mafp_pwr_btn_shield_on (FpiDeviceMafpmoc *self, int on)
{ {
GError *pre_error = fpi_ssm_get_error (self->task_ssm); g_autoptr(GError) pre_error = fpi_ssm_get_error (self->task_ssm);
if (pre_error && pre_error->code == G_USB_DEVICE_ERROR_FAILED && if (g_error_matches (pre_error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_FAILED))
g_str_equal (g_quark_to_string (pre_error->domain), "g-usb-device-error-quark"))
{ {
fpi_ssm_next_state (self->task_ssm); fpi_ssm_next_state (self->task_ssm);
return; return;
@@ -1408,6 +1405,7 @@ fp_verify_get_image_cb (FpiDeviceMafpmoc *self,
mafp_cmd_response_t *resp, mafp_cmd_response_t *resp,
GError *error) GError *error)
{ {
g_autoptr(GError) local_error = NULL;
FpDevice *dev = FP_DEVICE (self); FpDevice *dev = FP_DEVICE (self);
FpVerifyState nextState = FP_VERIFY_GET_IMAGE; FpVerifyState nextState = FP_VERIFY_GET_IMAGE;
@@ -1417,12 +1415,9 @@ fp_verify_get_image_cb (FpiDeviceMafpmoc *self,
return; return;
} }
if (fpi_device_action_is_cancelled (dev)) if (g_cancellable_set_error_if_cancelled (fpi_device_get_cancellable (dev),
&local_error))
{ {
GError *local_error = NULL;
g_cancellable_set_error_if_cancelled (fpi_device_get_cancellable (dev),
&local_error);
fpi_ssm_mark_failed (self->task_ssm, g_steal_pointer (&local_error)); fpi_ssm_mark_failed (self->task_ssm, g_steal_pointer (&local_error));
return; return;
} }
@@ -1505,6 +1500,7 @@ fp_verify_get_tpl_info_cb (FpiDeviceMafpmoc *self,
mafp_cmd_response_t *resp, mafp_cmd_response_t *resp,
GError *error) GError *error)
{ {
g_autoptr(GError) local_error = NULL;
FpDevice *dev = FP_DEVICE (self); FpDevice *dev = FP_DEVICE (self);
FpPrint *new_scan = NULL; FpPrint *new_scan = NULL;
FpPrint *matching = NULL; FpPrint *matching = NULL;
@@ -1515,12 +1511,9 @@ fp_verify_get_tpl_info_cb (FpiDeviceMafpmoc *self,
return; return;
} }
if (fpi_device_action_is_cancelled (dev)) if (g_cancellable_set_error_if_cancelled (fpi_device_get_cancellable (dev),
&local_error))
{ {
GError *local_error = NULL;
g_cancellable_set_error_if_cancelled (fpi_device_get_cancellable (dev),
&local_error);
fpi_ssm_mark_failed (self->task_ssm, g_steal_pointer (&local_error)); fpi_ssm_mark_failed (self->task_ssm, g_steal_pointer (&local_error));
return; return;
} }
@@ -2327,7 +2320,7 @@ mafp_init (FpDevice *device)
{ {
fp_dbg ("mafp_init"); fp_dbg ("mafp_init");
FpiDeviceMafpmoc *self = FPI_DEVICE_MAFPMOC (device); FpiDeviceMafpmoc *self = FPI_DEVICE_MAFPMOC (device);
GError *error = NULL; g_autoptr(GError) error = NULL;
uint64_t driver_data; uint64_t driver_data;
driver_data = fpi_device_get_driver_data (device); driver_data = fpi_device_get_driver_data (device);
@@ -2336,7 +2329,7 @@ mafp_init (FpDevice *device)
if (!g_usb_device_reset (fpi_device_get_usb_device (device), &error)) if (!g_usb_device_reset (fpi_device_get_usb_device (device), &error))
{ {
fp_dbg ("g_usb_device_reset err: %s", error->message); fp_dbg ("g_usb_device_reset err: %s", error->message);
fpi_device_open_complete (FP_DEVICE (self), error); fpi_device_open_complete (FP_DEVICE (self), g_steal_pointer (&error));
return; return;
} }
@@ -2344,7 +2337,7 @@ mafp_init (FpDevice *device)
fp_dbg ("g_usb_device_claim_interface"); fp_dbg ("g_usb_device_claim_interface");
if (!g_usb_device_claim_interface (fpi_device_get_usb_device (device), 0, 0, &error)) if (!g_usb_device_claim_interface (fpi_device_get_usb_device (device), 0, 0, &error))
{ {
fpi_device_open_complete (FP_DEVICE (self), error); fpi_device_open_complete (FP_DEVICE (self), g_steal_pointer (&error));
return; return;
} }