[glib-networking/mcatanzaro/tls-thread] progress_
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/tls-thread] progress_
- Date: Sun, 11 Aug 2019 21:35:47 +0000 (UTC)
commit f1d70a3314bd4bfa30d8e63f46d4af724bd3f8d8
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun Aug 11 16:35:16 2019 -0500
progress_
tls/gnutls/gtlsclientconnection-gnutls.c | 3 ---
tls/tests/connection.c | 12 ------------
2 files changed, 15 deletions(-)
---
diff --git a/tls/gnutls/gtlsclientconnection-gnutls.c b/tls/gnutls/gtlsclientconnection-gnutls.c
index 7bb6216..384df22 100644
--- a/tls/gnutls/gtlsclientconnection-gnutls.c
+++ b/tls/gnutls/gtlsclientconnection-gnutls.c
@@ -448,8 +448,6 @@ g_tls_client_connection_gnutls_complete_handshake (GTlsConnectionBase *tls,
G_TLS_CONNECTION_BASE_CLASS (g_tls_client_connection_gnutls_parent_class)->
complete_handshake (tls, negotiated_protocol, error);
- // FIXME: restore
-#if 0
resumed = gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (G_TLS_CONNECTION_GNUTLS (tls)));
if (!resumed)
{
@@ -471,7 +469,6 @@ g_tls_client_connection_gnutls_complete_handshake (GTlsConnectionBase *tls,
gnutls->session_data);
}
}
-#endif
}
static void
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 3d7a599..0db8cce 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -39,9 +39,6 @@
#include "openssl-include.h"
#endif
-//FIXME
-#include <glib/gstdio.h>
-
static const gchar *
tls_test_file_path (const char *name)
{
@@ -1647,8 +1644,6 @@ simul_async_read_complete (GObject *object,
nread = g_input_stream_read_finish (G_INPUT_STREAM (object),
result, &error);
g_assert_no_error (error);
-g_printf("%s: successfully read %zd bytes\n", __FUNCTION__, nread);
-fflush(stdout);
test->nread += nread;
g_assert_cmpint (test->nread, <=, TEST_DATA_LENGTH);
@@ -1681,14 +1676,10 @@ simul_async_write_complete (GObject *object,
nwrote = g_output_stream_write_finish (G_OUTPUT_STREAM (object),
result, &error);
g_assert_no_error (error);
-g_printf("%s: successfully wrote %zd bytes\n", __FUNCTION__, nwrote);
-fflush(stdout);
test->nwrote += nwrote;
if (test->nwrote < TEST_DATA_LENGTH)
{
-g_printf("test->nwrote=%zd < TEST_DATA_LENGTH %d, writing again...\n", test->nwrote, TEST_DATA_LENGTH);
-fflush(stdout);
g_output_stream_write_async (G_OUTPUT_STREAM (object),
&TEST_DATA[test->nwrote],
TEST_DATA_LENGTH - test->nwrote,
@@ -1718,9 +1709,6 @@ test_simultaneous_async (TestConnection *test,
memset (test->buf, 0, sizeof (test->buf));
test->nread = test->nwrote = 0;
-g_printf("%s: starting simul async read and async write\n", __FUNCTION__);
-fflush(stdout);
-
g_input_stream_read_async (g_io_stream_get_input_stream (test->client_connection),
test->buf, TEST_DATA_LENGTH / 2,
G_PRIORITY_DEFAULT, NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]