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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit a5c070f043bf915aef103a82d60767d5f1e67da6
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Dec 30 13:10:20 2019 -0600

    progress

 tls/base/gtlsoperationsthread-base.c     | 9 +--------
 tls/base/gtlsoperationsthread-base.h     | 2 --
 tls/gnutls/gtlsoperationsthread-gnutls.c | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/tls/base/gtlsoperationsthread-base.c b/tls/base/gtlsoperationsthread-base.c
index ae883da..993c86b 100644
--- a/tls/base/gtlsoperationsthread-base.c
+++ b/tls/base/gtlsoperationsthread-base.c
@@ -335,16 +335,12 @@ has_performed_successful_posthandshake_op (GTlsOperationsThreadBase *self)
 void
 g_tls_operations_thread_base_push_io (GTlsOperationsThreadBase *self,
                                       GIOCondition              direction,
-                                      gint64                    timeout,
                                       GCancellable             *cancellable)
 {
-  g_assert (direction & (G_IO_IN | G_IO_OUT));
-
   /* FIXME: this is weird, can't we get rid of it on OpenSSL side? */
   if (G_TLS_OPERATIONS_THREAD_BASE_GET_CLASS (self)->push_io)
     {
-      G_TLS_OPERATIONS_THREAD_BASE_GET_CLASS (self)->push_io (self, direction,
-                                                              timeout, cancellable);
+      G_TLS_OPERATIONS_THREAD_BASE_GET_CLASS (self)->push_io (self, direction, cancellable);
     }
 }
 
@@ -422,9 +418,6 @@ g_tls_operations_thread_base_pop_io (GTlsOperationsThreadBase  *self,
                                      GError                    *op_error,
                                      GError                   **error)
 {
-  g_assert (direction & (G_IO_IN | G_IO_OUT));
-  g_assert (!error || !*error);
-
   return G_TLS_OPERATIONS_THREAD_BASE_GET_CLASS (self)->pop_io (self, direction,
                                                                 success, op_error, error);
 }
diff --git a/tls/base/gtlsoperationsthread-base.h b/tls/base/gtlsoperationsthread-base.h
index da7d7b8..c61dc5b 100644
--- a/tls/base/gtlsoperationsthread-base.h
+++ b/tls/base/gtlsoperationsthread-base.h
@@ -59,7 +59,6 @@ struct _GTlsOperationsThreadBaseClass
 
   void                   (*push_io)                    (GTlsOperationsThreadBase  *self,
                                                         GIOCondition               direction,
-                                                        gint64                     timeout, /* FIXME: remove 
timeout? */
                                                         GCancellable              *cancellable);
   GTlsOperationStatus    (*pop_io)                     (GTlsOperationsThreadBase  *self,
                                                         GIOCondition               direction,
@@ -148,7 +147,6 @@ void                 g_tls_operations_thread_base_set_server_identity       (GTl
 
 void                 g_tls_operations_thread_base_push_io                   (GTlsOperationsThreadBase   
*self,
                                                                              GIOCondition                
direction,
-                                                                             gint64                      
timeout, /* FIXME: remove timeout? */
                                                                              GCancellable               
*cancellable);
 GTlsOperationStatus  g_tls_operations_thread_base_pop_io                    (GTlsOperationsThreadBase   
*self,
                                                                              GIOCondition                
direction,
diff --git a/tls/gnutls/gtlsoperationsthread-gnutls.c b/tls/gnutls/gtlsoperationsthread-gnutls.c
index d623b9a..d17b0c9 100644
--- a/tls/gnutls/gtlsoperationsthread-gnutls.c
+++ b/tls/gnutls/gtlsoperationsthread-gnutls.c
@@ -135,7 +135,7 @@ begin_gnutls_io (GTlsOperationsThreadGnutls *self,
   self->op_cancellable = cancellable;
 
   g_tls_operations_thread_base_push_io (G_TLS_OPERATIONS_THREAD_BASE (self),
-                                        direction, 0, cancellable);
+                                        direction, cancellable);
 }
 
 static GTlsOperationStatus