[GNUnet-SVN] [gnurl] 72/256: axtls: reorder functions topologically

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 3ea5461d4efe1e3c781fe9cb32778e298a0bc92a
Author: Johannes Schindelin <address@hidden>
AuthorDate: Sun Jun 25 12:44:26 2017 +0200

    axtls: reorder functions topologically
    
    The connect_finish() function (like many other functions after it) calls
    the Curl_axtls_close() function; While this is not a problem now
    (because axtls.h declares the latter function), a patch looming in the
    immediate future with make all of these functions file-local.
    
    So let's just move the Curl_axtls_close() function's definition before
    it is called.
    
    Signed-off-by: Johannes Schindelin <address@hidden>
---
 lib/vtls/axtls.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c
index 12c3a4fff..bd7498aad 100644
--- a/lib/vtls/axtls.c
+++ b/lib/vtls/axtls.c
@@ -284,6 +284,22 @@ static CURLcode connect_prep(struct connectdata *conn, int 
sockindex)
   return CURLE_OK;
 }
 
+void Curl_axtls_close(struct connectdata *conn, int sockindex)
+{
+  struct ssl_connect_data *connssl = &conn->ssl[sockindex];
+
+  infof(conn->data, "  Curl_axtls_close\n");
+
+    /* line from openssl.c: (void)SSL_shutdown(connssl->ssl);
+       axTLS compat layer does nothing for SSL_shutdown */
+
+    /* The following line is from openssl.c.  There seems to be no axTLS
+       equivalent.  ssl_free and ssl_ctx_free close things.
+       SSL_set_connect_state(connssl->handle); */
+
+  free_ssl_structs(connssl);
+}
+
 /*
  * For both blocking and non-blocking connects, this function finalizes the
  * SSL connection.
@@ -543,22 +559,6 @@ static ssize_t axtls_send(struct connectdata *conn,
   return rc;
 }
 
-void Curl_axtls_close(struct connectdata *conn, int sockindex)
-{
-  struct ssl_connect_data *connssl = &conn->ssl[sockindex];
-
-  infof(conn->data, "  Curl_axtls_close\n");
-
-    /* line from openssl.c: (void)SSL_shutdown(connssl->ssl);
-       axTLS compat layer does nothing for SSL_shutdown */
-
-    /* The following line is from openssl.c.  There seems to be no axTLS
-       equivalent.  ssl_free and ssl_ctx_free close things.
-       SSL_set_connect_state(connssl->handle); */
-
-  free_ssl_structs(connssl);
-}
-
 /*
  * This function is called to shut down the SSL layer but keep the
  * socket open (CCC - Clear Command Channel)

-- 
To stop receiving notification emails like this one, please contact
address@hidden