[commit] 1.3: move state assignment to a more natural place

[Oswald Buddenhagen via isync-devel]

commit 4ef8919508632dcd0cccee58d5ad7fc11e51ed84
Author: Oswald Buddenhagen <o...@users.sf.net>
Date:   Sun Jul 28 13:36:15 2019 +0200

    move state assignment to a more natural place
    
    ... so it's right next to the related callback assignment.

 src/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/socket.c b/src/socket.c
index 950c956..b7bffd5 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -299,6 +299,7 @@ socket_start_tls( conn_t *conn, void (*cb)( int ok, void 
*aux ) )
        static int ssl_inited;
 
        conn->callbacks.starttls = cb;
+       conn->state = SCK_STARTTLS;
 
        if (!ssl_inited) {
                SSL_library_init();
@@ -329,7 +330,6 @@ socket_start_tls( conn_t *conn, void (*cb)( int ok, void 
*aux ) )
        }
        SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER );
        socket_expect_read( conn, 1 );
-       conn->state = SCK_STARTTLS;
        start_tls_p2( conn );
 }
 


_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel