From ecc02cb5882dc2d38d3f8c6666b7aa49312f81ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 3 Apr 2020 03:29:12 +0200
Subject: [PATCH] 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.
---
 utils/delete.c | 4 ++--
 utils/enroll.c | 7 +------
 utils/list.c   | 4 ++--
 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);