summaryrefslogtreecommitdiff
path: root/lib/curl_sspi.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2012-04-23 16:27:47 +0200
committerYang Tse <yangsita@gmail.com>2012-04-23 16:27:47 +0200
commit071f8d4182ec86b236404e0af3dadfd0bf3270c8 (patch)
tree891f310592492c901b660952f9f17d9d3de810af /lib/curl_sspi.c
parentd83233501f4d45d033562411b4e747b9740b7c4b (diff)
downloadcurl-071f8d4182ec86b236404e0af3dadfd0bf3270c8.tar.gz
Revert "sspi - Small code tidy up"
This reverts commit 46cd5f1daddad3b3e542e6d93eee52e8bb9a8687.
Diffstat (limited to 'lib/curl_sspi.c')
-rw-r--r--lib/curl_sspi.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index b9a343b6c..e065f86c5 100644
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -35,6 +35,7 @@
/* The last #include file should be: */
#include "memdebug.h"
+
/* We use our own typedef here since some headers might lack these */
typedef PSecurityFunctionTableA (APIENTRY *INITSECURITYINTERFACE_FN_A)(VOID);
@@ -44,6 +45,7 @@ HMODULE s_hSecDll = NULL;
/* Pointer to SSPI dispatch table */
PSecurityFunctionTableA s_pSecFn = NULL;
+
/*
* Curl_sspi_global_init()
*
@@ -56,17 +58,19 @@ PSecurityFunctionTableA s_pSecFn = NULL;
* called through the Security Service Provider Interface dispatch table.
*/
-CURLcode Curl_sspi_global_init(void)
+CURLcode
+Curl_sspi_global_init(void)
{
OSVERSIONINFO osver;
INITSECURITYINTERFACE_FN_A pInitSecurityInterface;
/* If security interface is not yet initialized try to do this */
- if(!s_hSecDll) {
+ if(s_hSecDll == NULL) {
+
/* Find out Windows version */
memset(&osver, 0, sizeof(osver));
osver.dwOSVersionInfoSize = sizeof(osver);
- if(!GetVersionEx(&osver))
+ if(! GetVersionEx(&osver))
return CURLE_FAILED_INIT;
/* Security Service Provider Interface (SSPI) functions are located in
@@ -79,21 +83,21 @@ CURLcode Curl_sspi_global_init(void)
s_hSecDll = LoadLibrary("security.dll");
else
s_hSecDll = LoadLibrary("secur32.dll");
- if(!s_hSecDll)
+ if(! s_hSecDll)
return CURLE_FAILED_INIT;
/* Get address of the InitSecurityInterfaceA function from the SSPI dll */
pInitSecurityInterface = (INITSECURITYINTERFACE_FN_A)
GetProcAddress(s_hSecDll, "InitSecurityInterfaceA");
- if(!pInitSecurityInterface)
+ if(! pInitSecurityInterface)
return CURLE_FAILED_INIT;
/* Get pointer to Security Service Provider Interface dispatch table */
s_pSecFn = pInitSecurityInterface();
- if(!s_pSecFn)
+ if(! s_pSecFn)
return CURLE_FAILED_INIT;
- }
+ }
return CURLE_OK;
}
@@ -166,7 +170,8 @@ CURLcode Curl_sspi_version(int *major, int *minor, int *build, int *special)
* This deinitializes the Security Service Provider Interface from libcurl.
*/
-void Curl_sspi_global_cleanup(void)
+void
+Curl_sspi_global_cleanup(void)
{
if(s_hSecDll) {
FreeLibrary(s_hSecDll);