depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fp-device: Use an autopointer and steal the print when passed

Browse source 
Make it clearer that we're stealing the print when passing it away, instead
of just doing this silently.
This commit is contained in:
Marco Trevisan (Treviño) 2019-11-26 20:38:16 +01:00
parent 5927a205e3
commit b1d99e7608
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libfprint/fp-image-device.c
View file

@ -389,8 +389,8 @@ static void
fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, gpointer user_data) fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, gpointer user_data)
{ {
g_autoptr(FpImage) image = FP_IMAGE (source_object); g_autoptr(FpImage) image = FP_IMAGE (source_object);
g_autoptr(FpPrint) print = NULL;
GError *error = NULL; GError *error = NULL;
FpPrint *print = NULL;
FpDevice *device = FP_DEVICE (user_data); FpDevice *device = FP_DEVICE (user_data);
FpImageDevicePrivate *priv; FpImageDevicePrivate *priv;
FpDeviceAction action; FpDeviceAction action;
@ -443,7 +443,8 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
priv->enroll_stage += 1; priv->enroll_stage += 1;
} }
fpi_device_enroll_progress (device, priv->enroll_stage, print, error); fpi_device_enroll_progress (device, priv->enroll_stage,
g_steal_pointer (&print), error);
if (priv->enroll_stage == IMG_ENROLL_STAGES) if (priv->enroll_stage == IMG_ENROLL_STAGES)
{ {
@ -462,7 +463,7 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
else else
result = FPI_MATCH_ERROR; result = FPI_MATCH_ERROR;
fpi_device_verify_complete (device, result, print, error); fpi_device_verify_complete (device, result, g_steal_pointer (&print), error);
fp_image_device_deactivate (device); fp_image_device_deactivate (device);
} }
else if (action == FP_DEVICE_ACTION_IDENTIFY) else if (action == FP_DEVICE_ACTION_IDENTIFY)
@ -483,7 +484,7 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
} }
} }
fpi_device_identify_complete (device, result, print, error); fpi_device_identify_complete (device, result, g_steal_pointer (&print), error);
fp_image_device_deactivate (device); fp_image_device_deactivate (device);
} }
else else