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

pam: Remove GLib usage from copy/paste header

Browse Source
This commit is contained in:
Bastien Nocera
2020-01-14 15:18:47 +01:00
parent 8325d347d6
commit 0b598965b0
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pam/fingerprint-strings.h
View File

@ -105,7 +105,7 @@ struct {
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral" #pragma GCC diagnostic ignored "-Wformat-nonliteral"
G_GNUC_UNUSED static char *finger_str_to_msg(const char *finger_name, const char *driver_name, gboolean is_swipe) GNUC_UNUSED static char *finger_str_to_msg(const char *finger_name, const char *driver_name, bool is_swipe)
{ {
int i; int i;
@ -113,17 +113,25 @@ G_GNUC_UNUSED static char *finger_str_to_msg(const char *finger_name, const char
return NULL; return NULL;
for (i = 0; fingers[i].dbus_name != NULL; i++) { for (i = 0; fingers[i].dbus_name != NULL; i++) {
if (g_str_equal (fingers[i].dbus_name, finger_name)) { if (str_equal (fingers[i].dbus_name, finger_name)) {
if (is_swipe == FALSE) { if (is_swipe == false) {
if (driver_name) if (driver_name) {
return g_strdup_printf (TR (fingers[i].place_str_specific), driver_name); char *s;
else int ret;
return g_strdup (TR (fingers[i].place_str_generic)); ret = asprintf (&s, TR (fingers[i].place_str_specific), driver_name);
return ret >= 0 ? s : NULL;
} else {
return strdup (TR (fingers[i].place_str_generic));
}
} else { } else {
if (driver_name) if (driver_name) {
return g_strdup_printf (TR (fingers[i].swipe_str_specific), driver_name); char *s;
else int ret;
return g_strdup (TR (fingers[i].swipe_str_generic)); ret = asprintf (&s, TR (fingers[i].swipe_str_specific), driver_name);
return ret >= 0 ? s : NULL;
} else {
return strdup (TR (fingers[i].swipe_str_generic));
}
} }
} }
} }
@ -138,13 +146,13 @@ G_GNUC_UNUSED static char *finger_str_to_msg(const char *finger_name, const char
* verify-match * verify-match
* verify-unknown-error * verify-unknown-error
*/ */
G_GNUC_UNUSED static const char *verify_result_str_to_msg(const char *result, gboolean is_swipe) GNUC_UNUSED static const char *verify_result_str_to_msg(const char *result, bool is_swipe)
{ {
if (result == NULL) if (result == NULL)
return NULL; return NULL;
if (strcmp (result, "verify-retry-scan") == 0) { if (strcmp (result, "verify-retry-scan") == 0) {
if (is_swipe == FALSE) if (is_swipe == false)
return N_("Place your finger on the reader again"); return N_("Place your finger on the reader again");
else else
return N_("Swipe your finger again"); return N_("Swipe your finger again");
@ -164,13 +172,13 @@ G_GNUC_UNUSED static const char *verify_result_str_to_msg(const char *result, gb
* enroll-failed * enroll-failed
* enroll-unknown-error * enroll-unknown-error
*/ */
G_GNUC_UNUSED static const char *enroll_result_str_to_msg(const char *result, gboolean is_swipe) GNUC_UNUSED static const char *enroll_result_str_to_msg(const char *result, bool is_swipe)
{ {
if (result == NULL) if (result == NULL)
return NULL; return NULL;
if (strcmp (result, "enroll-retry-scan") == 0 || strcmp (result, "enroll-stage-passed") == 0) { if (strcmp (result, "enroll-retry-scan") == 0 || strcmp (result, "enroll-stage-passed") == 0) {
if (is_swipe == FALSE) if (is_swipe == false)
return N_("Place your finger on the reader again"); return N_("Place your finger on the reader again");
else else
return N_("Swipe your finger again"); return N_("Swipe your finger again");