From 6903c361571f7decc864c443f836b880c68102bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 18 Dec 2019 17:32:52 +0100 Subject: [PATCH] file-storage: Use first/last fingers references instead of named ones Don't depend in the hardcoded libfprint fingers order, but use instead the aliases for first/last fingers in libfprint order --- src/device.c | 6 +++--- src/file_storage.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/device.c b/src/device.c index 7399505..a0dd225 100644 --- a/src/device.c +++ b/src/device.c @@ -295,7 +295,7 @@ finger_num_to_name (int finger_num) { if (finger_num == -1) 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 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")) 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])) 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); } } diff --git a/src/file_storage.c b/src/file_storage.c index 8570063..880d188 100644 --- a/src/file_storage.c +++ b/src/file_storage.c @@ -43,7 +43,7 @@ #define DIR_PERMS 0700 #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() {