mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fp-device: Move FpDevice private functions to public library

Browse Source 
This these functions are not really needed by anything else than
FpDevice, so move them back to the cpp file, so that we don't expose
them in the private library, given that we don't need them
This commit is contained in:
Marco Trevisan (Treviño)
2022-10-13 19:42:50 +02:00
committed by Marco Trevisan
parent ddacf07e3b
commit 36bcb24b3a
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libfprint/fp-device-private.h
View File

@@ -111,8 +111,6 @@ typedef struct
GDestroyNotify enroll_progress_destroy; GDestroyNotify enroll_progress_destroy;
} FpEnrollData; } FpEnrollData;
void enroll_data_free (FpEnrollData *enroll_data);
typedef struct typedef struct
{ {
FpPrint *enrolled_print; /* verify */ FpPrint *enrolled_print; /* verify */
@@ -128,7 +126,6 @@ typedef struct
GDestroyNotify match_destroy; GDestroyNotify match_destroy;
} FpMatchData; } FpMatchData;
void match_data_free (FpMatchData *match_data);
void fpi_device_suspend (FpDevice *device); void fpi_device_suspend (FpDevice *device);
void fpi_device_resume (FpDevice *device); void fpi_device_resume (FpDevice *device);

26
libfprint/fp-device.c
View File

@@ -1088,6 +1088,15 @@ fp_device_resume_finish (FpDevice *device,
return g_task_propagate_boolean (G_TASK (result), error); return g_task_propagate_boolean (G_TASK (result), error);
} }
static void
enroll_data_free (FpEnrollData *data)
{
if (data->enroll_progress_destroy)
data->enroll_progress_destroy (data->enroll_progress_data);
data->enroll_progress_data = NULL;
g_clear_object (&data->print);
g_free (data);
}
/** /**
* fp_device_enroll: * fp_device_enroll:
@@ -1217,6 +1226,23 @@ fp_device_enroll_finish (FpDevice *device,
return g_task_propagate_pointer (G_TASK (result), error); return g_task_propagate_pointer (G_TASK (result), error);
} }
static void
match_data_free (FpMatchData *data)
{
g_clear_object (&data->print);
g_clear_object (&data->match);
g_clear_error (&data->error);
if (data->match_destroy)
data->match_destroy (data->match_data);
data->match_data = NULL;
g_clear_object (&data->enrolled_print);
g_clear_pointer (&data->gallery, g_ptr_array_unref);
g_free (data);
}
/** /**
* fp_device_verify: * fp_device_verify:
* @device: a #FpDevice * @device: a #FpDevice

27
libfprint/fpi-device.c
View File

@@ -522,33 +522,6 @@ fpi_device_get_driver_data (FpDevice *device)
return priv->driver_data; return priv->driver_data;
} }
void
enroll_data_free (FpEnrollData *data)
{
if (data->enroll_progress_destroy)
data->enroll_progress_destroy (data->enroll_progress_data);
data->enroll_progress_data = NULL;
g_clear_object (&data->print);
g_free (data);
}
void
match_data_free (FpMatchData *data)
{
g_clear_object (&data->print);
g_clear_object (&data->match);
g_clear_error (&data->error);
if (data->match_destroy)
data->match_destroy (data->match_data);
data->match_data = NULL;
g_clear_object (&data->enrolled_print);
g_clear_pointer (&data->gallery, g_ptr_array_unref);
g_free (data);
}
/** /**
* fpi_device_get_enroll_data: * fpi_device_get_enroll_data:
* @device: The #FpDevice * @device: The #FpDevice