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

compat: Use new GDate autoptr and define if needed

Browse source
This commit is contained in:
Marco Trevisan (Treviño) 2020-01-30 14:59:59 +01:00 committed by Benjamin Berg
parent cfbd5d27b7
commit 5faf8498d9
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/storage.c
View file

@ -22,6 +22,7 @@
#define FP_COMPONENT "example-storage" #define FP_COMPONENT "example-storage"
#include <libfprint/fprint.h> #include <libfprint/fprint.h>
#include <libfprint/fpi-compat.h>
#include "storage.h" #include "storage.h"
#include <errno.h> #include <errno.h>
@ -163,8 +164,8 @@ FpPrint *
print_create_template (FpDevice *dev, FpFinger finger) print_create_template (FpDevice *dev, FpFinger finger)
{ {
g_autoptr(GDateTime) datetime = NULL; g_autoptr(GDateTime) datetime = NULL;
g_autoptr(GDate) date = NULL;
FpPrint *template = NULL; FpPrint *template = NULL;
GDate *date = NULL;
gint year, month, day; gint year, month, day;
template = fp_print_new (dev); template = fp_print_new (dev);
@ -174,7 +175,6 @@ print_create_template (FpDevice *dev, FpFinger finger)
g_date_time_get_ymd (datetime, &year, &month, &day); g_date_time_get_ymd (datetime, &year, &month, &day);
date = g_date_new_dmy (day, month, year); date = g_date_new_dmy (day, month, year);
fp_print_set_enroll_date (template, date); fp_print_set_enroll_date (template, date);
g_date_free (date);
return template; return template;
} }

3
libfprint/drivers/synaptics/synaptics.c
View file

@ -520,8 +520,8 @@ list_msg_cb (FpiDeviceSynaptics *self,
userid[12] == '-' && userid[14] == '-' && userid[23] == '-') userid[12] == '-' && userid[14] == '-' && userid[23] == '-')
{ {
g_autofree gchar *copy = g_strdup (userid); g_autofree gchar *copy = g_strdup (userid);
g_autoptr(GDate) date = NULL;
gint32 date_ymd; gint32 date_ymd;
GDate *date = NULL;
gint32 finger; gint32 finger;
gchar *username; gchar *username;
/* Try to parse information from the string. */ /* Try to parse information from the string. */
@ -536,7 +536,6 @@ list_msg_cb (FpiDeviceSynaptics *self,
date = g_date_new (); date = g_date_new ();
fp_print_set_enroll_date (print, date); fp_print_set_enroll_date (print, date);
g_date_free (date);
copy[14] = '\0'; copy[14] = '\0';
finger = g_ascii_strtoll (copy + 13, NULL, 16); finger = g_ascii_strtoll (copy + 13, NULL, 16);

4
libfprint/fp-print.c
View file

@ -753,8 +753,8 @@ fp_print_deserialize (const guchar *data,
g_autoptr(GVariant) raw_value = NULL; g_autoptr(GVariant) raw_value = NULL;
g_autoptr(GVariant) value = NULL; g_autoptr(GVariant) value = NULL;
g_autoptr(GVariant) print_data = NULL; g_autoptr(GVariant) print_data = NULL;
g_autoptr(GDate) date = NULL;
guchar *aligned_data = NULL; guchar *aligned_data = NULL;
GDate *date = NULL;
guint8 finger_int8; guint8 finger_int8;
FpFinger finger; FpFinger finger;
g_autofree gchar *username = NULL; g_autofree gchar *username = NULL;
@ -882,8 +882,6 @@ fp_print_deserialize (const guchar *data,
"enroll_date", date, "enroll_date", date,
NULL); NULL);
g_date_free (date);
return g_steal_pointer (&result); return g_steal_pointer (&result);
invalid_format: invalid_format:

1
libfprint/fpi-compat.h
View file

@ -35,4 +35,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GParamSpec, g_param_spec_unref);
#if !GLIB_CHECK_VERSION (2, 63, 3) #if !GLIB_CHECK_VERSION (2, 63, 3)
typedef struct _FpDeviceClass FpDeviceClass; typedef struct _FpDeviceClass FpDeviceClass;
G_DEFINE_AUTOPTR_CLEANUP_FUNC (FpDeviceClass, g_type_class_unref); G_DEFINE_AUTOPTR_CLEANUP_FUNC (FpDeviceClass, g_type_class_unref);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (GDate, g_date_free);
#endif #endif