From: Andy Polyakov <appro@openssl.org>
Date: Sat, 24 Jul 2004 13:40:47 +0000 (+0000)
Subject: Add casts where casts due. It's "safe" to cast, because "wrong" casts
X-Git-Tag: OpenSSL_0_9_7e~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ecb88b95a2559ce9b7a983c00c2e1e7246ae2b0;p=openssl

Add casts where casts due. It's "safe" to cast, because "wrong" casts
will either be optimized away or never performed. The trouble is that
compiler first parses code, then optimizes, not both at once...
---

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 23f8e27d4e..0bef96080f 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -117,6 +117,7 @@
 
 #if defined(WIN32)
 #include <windows.h>
+#include <tchar.h>
 #endif
 
 #ifdef NeXT
@@ -831,7 +832,8 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 		if (wdir == NULL)
 			goto err_noclose;
 #ifndef OPENSSL_NO_MULTIBYTE
-		if (!MultiByteToWideChar(CP_ACP,0,dir,len_0,wdir,len_0))
+		if (!MultiByteToWideChar(CP_ACP,0,dir,len_0,
+					(WCHAR *)wdir,len_0))
 #endif
 			for (i=0;i<len_0;i++) wdir[i]=(TCHAR)dir[i];
 
@@ -866,7 +868,8 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 		if (sizeof(TCHAR) != sizeof(char))
 			{
 #ifndef OPENSSL_NO_MULTIBYTE
-			if (!WideCharToMultiByte(CP_ACP,0,fnam,flen_0,
+			if (!WideCharToMultiByte(CP_ACP,0,
+						(WCHAR *)fnam,flen_0,
 						slash,sizeof(buf)-len_0,
 						NULL,0))
 #endif