cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 04:13:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

file-storage: Use first/last fingers references instead of named ones

Browse Source 
Don't depend in the hardcoded libfprint fingers order, but use instead the
aliases for first/last fingers in libfprint order
This commit is contained in:
Marco Trevisan (Treviño)
2019-12-18 17:32:52 +01:00
parent d0df422f9b
commit 6903c36157
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device.c
View File

@ -295,7 +295,7 @@ finger_num_to_name (int finger_num)
{ {
if (finger_num == -1) if (finger_num == -1)
return "any"; return "any";
if (finger_num < FP_FINGER_LEFT_THUMB || finger_num > FP_FINGER_RIGHT_LITTLE) if (finger_num < FP_FINGER_FIRST || finger_num > FP_FINGER_LAST)
return NULL; return NULL;
return fingers[finger_num]; return fingers[finger_num];
} }
@ -308,7 +308,7 @@ finger_name_to_num (const char *finger_name)
if (finger_name == NULL || *finger_name == '\0' || g_str_equal (finger_name, "any")) if (finger_name == NULL || *finger_name == '\0' || g_str_equal (finger_name, "any"))
return -1; return -1;
for (i = FP_FINGER_LEFT_THUMB; i < G_N_ELEMENTS (fingers); i++) { for (i = FP_FINGER_FIRST; i <= FP_FINGER_LAST; i++) {
if (g_str_equal (finger_name, fingers[i])) if (g_str_equal (finger_name, fingers[i]))
return i; return i;
} }
@ -1301,7 +1301,7 @@ static void delete_enrolled_fingers(FprintDevice *rdev, const char *user)
} }
} }
for (i = FP_FINGER_LEFT_THUMB; i <= FP_FINGER_RIGHT_LITTLE; i++) { for (i = FP_FINGER_FIRST; i <= FP_FINGER_LAST; i++) {
store.print_data_delete(priv->dev, i, user); store.print_data_delete(priv->dev, i, user);
} }
} }

2
src/file_storage.c
View File

@ -43,7 +43,7 @@
#define DIR_PERMS 0700 #define DIR_PERMS 0700
#define FP_FINGER_IS_VALID(finger) \ #define FP_FINGER_IS_VALID(finger) \
((finger) >= FP_FINGER_LEFT_THUMB && (finger) <= FP_FINGER_RIGHT_LITTLE) ((finger) >= FP_FINGER_FIRST && (finger) <= FP_FINGER_LAST)
static const char *get_storage_path() static const char *get_storage_path()
{ {