|
 |
73b847 |
From c064261975a12c68d34da8f52ff11942842a4e61 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: Benjamin Berg <bberg@redhat.com>
|
|
|
73b847 |
Date: Wed, 4 Dec 2019 19:55:25 +0100
|
|
|
73b847 |
Subject: [PATCH 094/181] virtual-image: Only print warnings for actual errors
|
|
|
73b847 |
|
|
|
73b847 |
No need to warn for lost connections (if we don't expect more data) or
|
|
|
73b847 |
cancellations.
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/drivers/virtual-image.c | 7 ++++---
|
|
|
73b847 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/drivers/virtual-image.c b/libfprint/drivers/virtual-image.c
|
|
|
73b847 |
index c271c7a..07a631f 100644
|
|
|
73b847 |
--- a/libfprint/drivers/virtual-image.c
|
|
|
73b847 |
+++ b/libfprint/drivers/virtual-image.c
|
|
|
73b847 |
@@ -75,9 +75,9 @@ recv_image_img_recv_cb (GObject *source_object,
|
|
|
73b847 |
{
|
|
|
73b847 |
if (!success)
|
|
|
73b847 |
{
|
|
|
73b847 |
- g_warning ("Error receiving header for image data: %s", error->message);
|
|
|
73b847 |
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
|
|
|
73b847 |
return;
|
|
|
73b847 |
+ g_warning ("Error receiving header for image data: %s", error->message);
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
self = FPI_DEVICE_VIRTUAL_IMAGE (user_data);
|
|
|
73b847 |
@@ -113,9 +113,10 @@ recv_image_hdr_recv_cb (GObject *source_object,
|
|
|
73b847 |
{
|
|
|
73b847 |
if (!success)
|
|
|
73b847 |
{
|
|
|
73b847 |
- g_warning ("Error receiving header for image data: %s", error->message);
|
|
|
73b847 |
- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
|
|
|
73b847 |
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
|
|
|
73b847 |
+ g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CLOSED))
|
|
|
73b847 |
return;
|
|
|
73b847 |
+ g_warning ("Error receiving header for image data: %s", error->message);
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
self = FPI_DEVICE_VIRTUAL_IMAGE (user_data);
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|