aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2012-04-22 18:59:07 +0100
committerSteve Holme <steve_holme@hotmail.com>2012-04-22 18:59:07 +0100
commit46cd5f1daddad3b3e542e6d93eee52e8bb9a8687 (patch)
tree64a79e6bf016a8e522b69ec00bd2f8883e41ae24
parent2976de480808119dae08fc6f52c8d75ba1aedb1a (diff)
sspi - Small code tidy up
-rw-r--r--lib/curl_sspi.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index e065f86c5..b9a343b6c 100644
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -35,7 +35,6 @@
/* 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);
@@ -45,7 +44,6 @@ HMODULE s_hSecDll = NULL;
/* Pointer to SSPI dispatch table */
PSecurityFunctionTableA s_pSecFn = NULL;
-
/*
* Curl_sspi_global_init()
*
@@ -58,19 +56,17 @@ 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 == NULL) {
-
+ if(!s_hSecDll) {
/* 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
@@ -83,21 +79,21 @@ 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;
}
@@ -170,8 +166,7 @@ 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);