From f7cef6d61723d4c395d4f8e2bd357e42f69d109c Mon Sep 17 00:00:00 2001 From: marynate Date: Fri, 21 Feb 2014 19:48:04 +0800 Subject: [PATCH] remove unnecessary error check when converting ascii to unicode --- platform/windows/godot_win.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/windows/godot_win.cpp b/platform/windows/godot_win.cpp index ddfadf98cac..fa573b9421f 100644 --- a/platform/windows/godot_win.cpp +++ b/platform/windows/godot_win.cpp @@ -116,16 +116,13 @@ PCHAR* } char* mb_to_utf8(const char* mbs) { - int wlen = MultiByteToWideChar(CP_ACP,0,mbs,-1,NULL,0); - if (wlen < 0) - wlen = 0; + + int wlen = MultiByteToWideChar(CP_ACP,0,mbs,-1,NULL,0); // returns 0 if failed wchar_t *wbuf = new wchar_t[wlen + 1]; MultiByteToWideChar(CP_ACP,0,mbs,-1,wbuf,wlen); wbuf[wlen]=0; int ulen = WideCharToMultiByte(CP_UTF8,0,wbuf,-1,NULL,0,NULL,NULL); - if (ulen < 0) - ulen = 0; char * ubuf = new char[ulen + 1]; WideCharToMultiByte(CP_UTF8,0,wbuf,-1,ubuf,ulen,NULL,NULL); ubuf[ulen] = 0;