From: Pierre Joye <pajoye@php.net>
Date: Thu, 20 Jan 2011 06:45:52 +0000 (+0000)
Subject: - init err (and simplify)
X-Git-Tag: php-5.3.6RC1~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17c1ba460d1c73e05bbb01a452387d374777a8e4;p=php

- init err (and simplify)
---

diff --git a/ext/com_dotnet/com_olechar.c b/ext/com_dotnet/com_olechar.c
index eb8baf1b96..1cd853b794 100644
--- a/ext/com_dotnet/com_olechar.c
+++ b/ext/com_dotnet/com_olechar.c
@@ -79,7 +79,6 @@ PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, i
 		length = WideCharToMultiByte(codepage, 0, olestring, -1, string, length, NULL, NULL);
 		ok = length > 0;
 	} else {
-		err = GetLastError();
 		string = (char*)emalloc(sizeof(char));
 		*string = '\0';
 		ok = FALSE;
@@ -87,7 +86,7 @@ PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, i
 	}
 
 	if (!ok) {
-		char *msg = php_win_err(err);
+		char *msg = php_win32_error_to_msg(GetLastError());
 
 		php_error_docref(NULL TSRMLS_CC, E_WARNING,
 			"Could not convert string from unicode: `%s'", msg);