[Spice-devel] [spice-gtk v4 18/24] file-xfer: use helper function for debug xfer-task

[Victor Toso]

---
 src/channel-main.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/channel-main.c b/src/channel-main.c
index 63f0b9b..2c9a6fb 100644
--- a/src/channel-main.c
+++ b/src/channel-main.c
@@ -76,6 +76,7 @@ static gssize spice_file_transfer_task_read_finish(SpiceFileTransferTask *self,
                                                    GError **error);
 static guint64 spice_file_transfer_task_get_file_size(SpiceFileTransferTask *self);
 static guint64 spice_file_transfer_task_get_bytes_read(SpiceFileTransferTask *self);
+static void spice_file_transfer_task_debug_info(SpiceFileTransferTask *self);
 
 /**
  * SECTION:file-transfer-task
@@ -1893,18 +1894,8 @@ static void file_xfer_data_flushed_cb(GObject *source_object,
 
     file_transfer_operation_send_progress(self);
 
-    if (spice_util_get_debug()) {
-        const GTimeSpan interval = 20 * G_TIME_SPAN_SECOND;
-        gint64 now = g_get_monotonic_time();
-
-        if (interval < now - self->last_update) {
-            gchar *basename = g_file_get_basename(self->file);
-            self->last_update = now;
-            SPICE_DEBUG("transferred %.2f%% of the file %s",
-                        100.0 * self->read_bytes / self->file_size, basename);
-            g_free(basename);
-        }
-    }
+    if (spice_util_get_debug())
+        spice_file_transfer_task_debug_info(self);
 
     /* Read more data */
     spice_file_transfer_task_read_async(self, file_xfer_read_async_cb, NULL);
@@ -3532,6 +3523,20 @@ static gssize spice_file_transfer_task_read_finish(SpiceFileTransferTask *self,
     return nbytes;
 }
 
+static void spice_file_transfer_task_debug_info(SpiceFileTransferTask *self)
+{
+    const GTimeSpan interval = 20 * G_TIME_SPAN_SECOND;
+    gint64 now = g_get_monotonic_time();
+
+    if (interval < now - self->last_update) {
+        gchar *basename = g_file_get_basename(self->file);
+        self->last_update = now;
+        SPICE_DEBUG("transferred %.2f%% of the file %s",
+                    100.0 * self->read_bytes / self->file_size, basename);
+        g_free(basename);
+    }
+}
+
 static void
 spice_file_transfer_task_get_property(GObject *object,
                                       guint property_id,
-- 
2.7.4