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

verify: Add a verify_quit convenience function

Browse source 
It ends the loop if the device is not open, otherwise closes it and ends
the loop once done.
This commit is contained in:
Marco Trevisan (Treviño) 2020-01-16 14:36:41 +01:00
parent bc8a5859e3
commit 078cea1709
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
examples/verify.c
View file

@ -55,6 +55,19 @@ on_device_closed (FpDevice *dev, GAsyncResult *res, void *user_data)
g_main_loop_quit (verify_data->loop); g_main_loop_quit (verify_data->loop);
} }
static void
verify_quit (FpDevice *dev,
VerifyData *verify_data)
{
if (!fp_device_is_open (dev))
{
g_main_loop_quit (verify_data->loop);
return;
}
fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed, verify_data);
}
static void start_verification (FpDevice *dev, static void start_verification (FpDevice *dev,
VerifyData *verify_data); VerifyData *verify_data);
@ -71,7 +84,7 @@ on_verify_completed (FpDevice *dev, GAsyncResult *res, void *user_data)
if (!fp_device_verify_finish (dev, res, &match, &print, &error)) if (!fp_device_verify_finish (dev, res, &match, &print, &error))
{ {
g_warning ("Failed to verify print: %s", error->message); g_warning ("Failed to verify print: %s", error->message);
g_main_loop_quit (verify_data->loop); verify_quit (dev, verify_data);
return; return;
} }
@ -98,8 +111,7 @@ on_verify_completed (FpDevice *dev, GAsyncResult *res, void *user_data)
return; return;
} }
fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed, verify_quit (dev, verify_data);
verify_data);
} }
static void static void
@ -143,8 +155,7 @@ on_list_completed (FpDevice *dev, GAsyncResult *res, gpointer user_data)
{ {
g_warning ("Did you remember to enroll your %s finger first?", g_warning ("Did you remember to enroll your %s finger first?",
finger_to_string (verify_data->finger)); finger_to_string (verify_data->finger));
fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed, verify_quit (dev, verify_data);
verify_data);
return; return;
} }
@ -160,7 +171,7 @@ on_list_completed (FpDevice *dev, GAsyncResult *res, gpointer user_data)
else else
{ {
g_warning ("Loading prints failed with error %s", error->message); g_warning ("Loading prints failed with error %s", error->message);
g_main_loop_quit (verify_data->loop); verify_quit (dev, verify_data);
} }
} }
@ -177,8 +188,7 @@ start_verification (FpDevice *dev, VerifyData *verify_data)
{ {
g_warning ("Unknown finger selected"); g_warning ("Unknown finger selected");
verify_data->ret_value = EXIT_FAILURE; verify_data->ret_value = EXIT_FAILURE;
fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed, verify_quit (dev, verify_data);
verify_data);
return; return;
} }
@ -202,8 +212,7 @@ start_verification (FpDevice *dev, VerifyData *verify_data)
g_warning ("Failed to load fingerprint data"); g_warning ("Failed to load fingerprint data");
g_warning ("Did you remember to enroll your %s finger first?", g_warning ("Did you remember to enroll your %s finger first?",
finger_to_string (verify_data->finger)); finger_to_string (verify_data->finger));
fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed, verify_quit (dev, verify_data);
verify_data);
return; return;
} }
@ -225,7 +234,7 @@ on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
if (!fp_device_open_finish (dev, res, &error)) if (!fp_device_open_finish (dev, res, &error))
{ {
g_warning ("Failed to open device: %s", error->message); g_warning ("Failed to open device: %s", error->message);
g_main_loop_quit (verify_data->loop); verify_quit (dev, verify_data);
return; return;
} }