From 742ddc9d8f987e723451bdb1be6b4cbea1e39a55 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 25 Jun 2017 12:44:26 +0200 Subject: [PATCH] schannel: reorder functions topologically The _shutdown() function calls the _session_free() function; While this is not a problem now (because schannel.h declares both functions), a patch looming in the immediate future with make all of these functions file-local. So let's just move the _session_free() function's definition before it is called. Signed-off-by: Johannes Schindelin --- lib/vtls/schannel.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index c65f6b394..8308ccbc6 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -1435,6 +1435,18 @@ void Curl_schannel_close(struct connectdata *conn, int sockindex) Curl_ssl_shutdown(conn, sockindex); } +void Curl_schannel_session_free(void *ptr) +{ + /* this is expected to be called under sessionid lock */ + struct curl_schannel_cred *cred = ptr; + + cred->refcount--; + if(cred->refcount == 0) { + s_pSecFn->FreeCredentialsHandle(&cred->cred_handle); + Curl_safefree(cred); + } +} + int Curl_schannel_shutdown(struct connectdata *conn, int sockindex) { /* See https://msdn.microsoft.com/en-us/library/windows/desktop/aa380138.aspx @@ -1539,18 +1551,6 @@ int Curl_schannel_shutdown(struct connectdata *conn, int sockindex) return CURLE_OK; } -void Curl_schannel_session_free(void *ptr) -{ - /* this is expected to be called under sessionid lock */ - struct curl_schannel_cred *cred = ptr; - - cred->refcount--; - if(cred->refcount == 0) { - s_pSecFn->FreeCredentialsHandle(&cred->cred_handle); - Curl_safefree(cred); - } -} - int Curl_schannel_init(void) { return (Curl_sspi_global_init() == CURLE_OK ? 1 : 0);