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

device: Mark fingers names array as const and use unique name

Browse Source 
With the stronger warnings enabled when building with meson, we get a
warning for all the fingers definitions:

  ../src/device.c:38:24: warning: initialization discards ‘const’ qualifier
  from pointer target type [-Wdiscarded-qualifiers]
    38 |  [FP_FINGER_UNKNOWN] = "unknown",

As the `fingers` array name was shadowed in another file:

  ../src/device.c:1000:11: warning: declaration of ‘fingers’ shadows a
  global declaration [-Wshadow]
    1000 |   GSList *fingers, *finger;
This commit is contained in:
Marco Trevisan (Treviño)
2020-01-27 18:55:05 +01:00
committed by Bastien Nocera
parent 95e95d2910
commit 7d8450e5ab
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device.c
View File

@ -34,7 +34,7 @@
#include "fprintd.h" #include "fprintd.h"
#include "storage.h" #include "storage.h"
static char *fingers[] = { static const char *FINGERS_NAMES[] = {
[FP_FINGER_UNKNOWN] = "unknown", [FP_FINGER_UNKNOWN] = "unknown",
"left-thumb", "left-thumb",
"left-index-finger", "left-index-finger",
@ -298,7 +298,7 @@ finger_num_to_name (int finger_num)
return "any"; return "any";
if (!FP_FINGER_IS_VALID (finger_num)) if (!FP_FINGER_IS_VALID (finger_num))
return NULL; return NULL;
return fingers[finger_num]; return FINGERS_NAMES[finger_num];
} }
static int static int
@ -310,7 +310,7 @@ finger_name_to_num (const char *finger_name)
return -1; return -1;
for (i = FP_FINGER_FIRST; i <= FP_FINGER_LAST; 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_NAMES[i]))
return i; return i;
} }