[glib-networking/mcatanzaro/tls-thread] progress

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 102bf09e188d95e05aad9544ae77cde733ddb83b
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Aug 12 16:10:48 2019 -0500

    progress

 tls/base/gtlsconnection-base.c     | 18 ------------------
 tls/gnutls/gtlsconnection-gnutls.c |  4 +---
 2 files changed, 1 insertion(+), 21 deletions(-)
---
diff --git a/tls/base/gtlsconnection-base.c b/tls/base/gtlsconnection-base.c
index 6855b2c..6028200 100644
--- a/tls/base/gtlsconnection-base.c
+++ b/tls/base/gtlsconnection-base.c
@@ -928,33 +928,17 @@ tls_source_sync (GTlsConnectionBaseSource *tls_source)
                                     tls_source->child_source);
       g_source_unref (tls_source->child_source);
     }
-GTLS_DEBUG (tls, "%s: tls_source=%p op_waiting=%d io_waiting=%d", __FUNCTION__, tls_source, op_waiting, 
io_waiting);
 
   if (op_waiting)
-{
-GTLS_DEBUG (tls, "created GCancellableSource");
     tls_source->child_source = g_cancellable_source_new (priv->waiting_for_op);
-}
   else if (io_waiting && G_IS_DATAGRAM_BASED (tls_source->base))
-{
-GTLS_DEBUG (tls, "created GDatagramBasedSource");
     tls_source->child_source = g_datagram_based_create_source (priv->base_socket, tls_source->condition, 
NULL);
-}
   else if (io_waiting && G_IS_POLLABLE_INPUT_STREAM (tls_source->base))
-{
-GTLS_DEBUG (tls, "created GPollableInputStreamSource");
     tls_source->child_source = g_pollable_input_stream_create_source (priv->base_istream, NULL);
-}
   else if (io_waiting && G_IS_POLLABLE_OUTPUT_STREAM (tls_source->base))
-{
-GTLS_DEBUG (tls, "created GPollableOutputStreamSource");
     tls_source->child_source = g_pollable_output_stream_create_source (priv->base_ostream, NULL);
-}
   else
-{
-GTLS_DEBUG (tls, "op ready, created GTimeoutSource and it's set to expire!");
     tls_source->child_source = g_timeout_source_new (0);
-}
 
   g_source_set_callback (tls_source->child_source, dummy_callback, NULL, NULL);
   g_source_add_child_source ((GSource *)tls_source, tls_source->child_source);
@@ -1881,9 +1865,7 @@ g_tls_connection_base_read (GTlsConnectionBase  *tls,
         }
       else
         {
-GTLS_DEBUG (tls, "%s: Entering TLS thread read...", __FUNCTION__);
           status = g_tls_thread_read (priv->thread, buffer, size, timeout, &nread, cancellable, error);
-GTLS_DEBUG (tls, "%s: Completed TLS thread read, status=%d nread=%zd", __FUNCTION__, status, nread);
         }
 
       yield_op (tls, G_TLS_CONNECTION_BASE_OP_READ, status);
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 604ccf6..ad1e949 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -938,7 +938,6 @@ g_tls_connection_gnutls_read (GTlsConnectionBase  *tls,
 
   BEGIN_GNUTLS_IO (gnutls, G_IO_IN, 0, cancellable);
   ret = gnutls_record_recv (priv->session, buffer, size);
-GTLS_DEBUG (tls, "%s: read completed: ret=%zd (%s)", __FUNCTION__, ret, ret < 0 ? gnutls_strerror (ret) : 
"");
   END_GNUTLS_IO (gnutls, G_IO_IN, ret, status, _("Error reading data from TLS socket"), error);
 
   *nread = MAX (ret, 0);
@@ -1018,13 +1017,12 @@ g_tls_connection_gnutls_write (GTlsConnectionBase  *tls,
   GTlsConnectionGnutlsPrivate *priv = g_tls_connection_gnutls_get_instance_private (gnutls);
   GTlsConnectionBaseStatus status;
   gssize ret;
-GTLS_DEBUG (tls, "%s: writing buffer size=%zu", __FUNCTION__, size);
+
   BEGIN_GNUTLS_IO (gnutls, G_IO_OUT, timeout, cancellable);
   ret = gnutls_record_send (priv->session, buffer, size);
   END_GNUTLS_IO (gnutls, G_IO_OUT, ret, status, _("Error writing data to TLS socket"), error);
 
   *nwrote = MAX (ret, 0);
-GTLS_DEBUG (tls, "%s: wrote %zd bytes", __FUNCTION__, ret);
   return status;
 }