From b97c2d7666072461f2a705b4cc02aa20dbe8b172 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 20 Oct 2009 18:54:08 +0000 Subject: [PATCH] cleaner --- src/util/connection.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/util/connection.c b/src/util/connection.c index ad2bf14c0..fa8430638 100644 --- a/src/util/connection.c +++ b/src/util/connection.c @@ -1344,6 +1344,13 @@ transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) return; } GNUNET_assert (NULL != sock->sock); + if (tc->write_ready == NULL) + { + /* special circumstances (in particular, + PREREQ_DONE after connect): not yet ready to write, + but no "fatal" error either. Hence retry. */ + goto SCHEDULE_WRITE; + } if (! GNUNET_NETWORK_fdset_isset (tc->write_ready, sock->sock)) { @@ -1361,13 +1368,6 @@ transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) transmit_error (sock); return; /* connect failed for good, we're finished */ } - if ((tc->write_ready == NULL) || (!GNUNET_NETWORK_fdset_isset (tc->write_ready, sock->sock))) - { - /* special circumstances (in particular, - PREREQ_DONE after connect): not yet ready to write, - but no "fatal" error either. Hence retry. */ - goto SCHEDULE_WRITE; - } GNUNET_assert (sock->write_buffer_off >= sock->write_buffer_pos); process_notify (sock); have = sock->write_buffer_off - sock->write_buffer_pos; -- 2.25.1