diff options
| author | Sven Strickroth <email@cs-ware.de> | 2013-02-01 22:53:51 +0100 |
|---|---|---|
| committer | Sven Strickroth <email@cs-ware.de> | 2013-02-02 00:55:32 +0100 |
| commit | c70455c75e30bf2a4cc5abdf4229d12d0e6cf159 (patch) | |
| tree | 5f57f877e93e69f182336ad33ffa7b31c19baba0 /src/netops.c | |
| parent | bd25a302d3232dea375f226602fdcdb3a83abcdc (diff) | |
| download | libgit2-c70455c75e30bf2a4cc5abdf4229d12d0e6cf159.tar.gz | |
Deduplicate FormatMessage UTF-16 to UTF-8 conversion code
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Diffstat (limited to 'src/netops.c')
| -rw-r--r-- | src/netops.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/netops.c b/src/netops.c index 86579c7f2..fd83a1cc3 100644 --- a/src/netops.c +++ b/src/netops.c @@ -41,27 +41,14 @@ static void net_set_error(const char *str) { int error = WSAGetLastError(); - LPWSTR err_str = NULL; + char * win32_error = git_win32_get_error_message(error); - int size = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&err_str, 0, 0); - - int utf8_size = WideCharToMultiByte(CP_UTF8, 0, err_str, -1, NULL, 0, NULL, NULL); - char * err_str_utf8 = git__malloc(utf8_size * sizeof(char)); - if (err_str_utf8 == NULL) { - LocalFree(err_str); - return; - } - - if (!WideCharToMultiByte(CP_UTF8, 0, err_str, -1, err_str_utf8, utf8_size, NULL, NULL)) { - LocalFree(err_str); - git__free(err_str_utf8); - return; + if (win32_error) { + giterr_set(GITERR_NET, "%s: %s", str, win32_error); + git__free(win32_error); + } else { + giterr_set(GITERR_NET, str); } - - giterr_set(GITERR_NET, "%s: %s", str, err_str_utf8); - LocalFree(err_str); - git__free(err_str_utf8); } #else static void net_set_error(const char *str) |