diff options
author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2020-04-03 03:29:12 +0200 |
---|---|---|
committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2020-11-04 21:06:13 +0100 |
commit | ecc02cb5882dc2d38d3f8c6666b7aa49312f81ae (patch) | |
tree | a681705d5dcad213eae69b4d10d419add2e5d89b /utils | |
parent | 091f373109c9bf730f8b91a9d9d540df798ab7d6 (diff) |
utils: Uniform the no-devices error messages removing duplicated checks
Use error messages to be consistent, and avoid checking for a returned
value when dbus-glib function to fetch it returned false, as it's
implicit that we had a failure.
Otherwise if didn't fail we are sure that we got the requested value.
Diffstat (limited to 'utils')
-rw-r--r-- | utils/delete.c | 4 | ||||
-rw-r--r-- | utils/enroll.c | 7 | ||||
-rw-r--r-- | utils/list.c | 4 | ||||
-rw-r--r-- | utils/verify.c | 7 |
4 files changed, 6 insertions, 16 deletions
diff --git a/utils/delete.c b/utils/delete.c index cf27ebf..0c25b7b 100644 --- a/utils/delete.c +++ b/utils/delete.c @@ -89,12 +89,12 @@ static void process_devices(char **argv) guint i; if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error)) { - g_print("list_devices failed: %s\n", error->message); + g_print("Impossible to get devices: %s\n", error->message); exit (1); } if (devices->len == 0) { - g_print("No devices found\n"); + g_print("No devices available\n"); exit(1); } diff --git a/utils/enroll.c b/utils/enroll.c index 4dd3359..8bd55e9 100644 --- a/utils/enroll.c +++ b/utils/enroll.c @@ -57,14 +57,9 @@ static DBusGProxy *open_device(const char *username) DBusGProxy *dev; if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error)) { - g_print("list_devices failed: %s\n", error->message); + g_print("Impossible to enroll: %s\n", error->message); exit (1); } - - if (path == NULL) { - g_print("No devices found\n"); - exit(1); - } g_print("Using device %s\n", path); diff --git a/utils/list.c b/utils/list.c index 8098c0c..54bc34b 100644 --- a/utils/list.c +++ b/utils/list.c @@ -94,12 +94,12 @@ static void process_devices(char **argv) guint i; if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error)) { - g_print("list_devices failed: %s\n", error->message); + g_print("Impossible to get devices: %s\n", error->message); exit (1); } if (devices->len == 0) { - g_print("No devices found\n"); + g_print("No devices available\n"); exit(1); } diff --git a/utils/verify.c b/utils/verify.c index 719b736..caac88e 100644 --- a/utils/verify.c +++ b/utils/verify.c @@ -54,14 +54,9 @@ static DBusGProxy *open_device(const char *username) DBusGProxy *dev; if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error)) { - g_print("list_devices failed: %s\n", error->message); + g_print("Impossible to verify: %s\n", error->message); exit (1); } - - if (path == NULL) { - g_print("No devices found\n"); - exit(1); - } g_print("Using device %s\n", path); |