]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
Revert "Give precedence to vector push function"
authorNikos Mavrogiannopoulos <nmav@redhat.com>
Tue, 6 Jan 2015 08:59:25 +0000 (09:59 +0100)
committerNikos Mavrogiannopoulos <nmav@redhat.com>
Tue, 6 Jan 2015 08:59:25 +0000 (09:59 +0100)
This reverts commit cb4ea413569803cbbf291abb27d30d14bfa971c5.

lib/gnutls_buffers.c

index e4279a229e841b3854deece69a105c00df51dd61..ef2ad236b322ba883bba5c48ba091bed978bf383 100644 (file)
@@ -483,13 +483,11 @@ _gnutls_writev(gnutls_session_t session, const giovec_t * giovec,
                }
        }
 
-       if (session->internals.vec_push_func != NULL && no_writev == 0)
-               i = session->internals.vec_push_func(fd, giovec,
-                                                    giovec_cnt);
-       else if (session->internals.push_func)
+       if (session->internals.push_func != NULL || no_writev != 0)
                i = _gnutls_writev_emu(session, fd, giovec, giovec_cnt);
        else
-               return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+               i = session->internals.vec_push_func(fd, giovec,
+                                                    giovec_cnt);
 
        if (i == -1) {
                int err = get_errno(session);