summaryrefslogtreecommitdiff
path: root/ext/com_dotnet
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-01-20 06:45:52 +0000
committerPierre Joye <pajoye@php.net>2011-01-20 06:45:52 +0000
commit17c1ba460d1c73e05bbb01a452387d374777a8e4 (patch)
tree496564617dce238f610cb3841795da3388b33fab /ext/com_dotnet
parent7f3100976f837f03ad5bca1c38b81075e2fcac16 (diff)
downloadphp-git-17c1ba460d1c73e05bbb01a452387d374777a8e4.tar.gz
- init err (and simplify)
Diffstat (limited to 'ext/com_dotnet')
-rw-r--r--ext/com_dotnet/com_olechar.c3
1 files changed, 1 insertions, 2 deletions
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);