From e77d8670685d38d80c940877a4fdfa3382c4d6cc Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 5 Jul 2012 22:16:15 +0200
Subject: unicode NTLM SSPI: cleanup

Reduce the number of #ifdef UNICODE directives used in source files.
---
 lib/socks_sspi.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'lib/socks_sspi.c')

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 43e0064a5..edebf7a47 100644
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -161,13 +161,11 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
   /* errors, keep sending it...                                            */
   for(;;) {
     TCHAR *sname;
-#ifdef UNICODE
-    sname = Curl_convert_UTF8_to_wchar(service_name);
+
+    sname = Curl_convert_UTF8_to_tchar(service_name);
     if(!sname)
       return CURLE_OUT_OF_MEMORY;
-#else
-    sname = service_name;
-#endif
+
     status = s_pSecFn->InitializeSecurityContext(&cred_handle,
                                                  context_handle,
                                                  sname,
@@ -184,9 +182,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
                                                  &sspi_ret_flags,
                                                  &expiry);
 
-#ifdef UNICODE
-    Curl_safefree(sname);
-#endif
+    Curl_unicodefree(sname);
 
     if(sspi_recv_token.pvBuffer) {
       s_pSecFn->FreeContextBuffer(sspi_recv_token.pvBuffer);
-- 
cgit v1.2.1