proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-04 13:33:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get utf8_size from WideCharToMultiByte instead of guessing it

Browse Source 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
This commit is contained in:
Sven Strickroth 2013-02-01 22:14:52 +01:00
parent b0dc81f055
commit 89ad1c57a3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/errors.c
View File

@ -61,11 +61,11 @@ void giterr_set(int error_class, const char *string, ...)
(LPWSTR)&lpMsgBuf, 0, NULL);
if (size) {
int utf8_size = size * 4 + 1;
int utf8_size = WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, -1, NULL, 0, NULL, NULL);
char *lpMsgBuf_utf8 = git__calloc(utf8_size, sizeof(char));
char *lpMsgBuf_utf8 = git__malloc(utf8_size * sizeof(char));
GITERR_CHECK_ALLOC(lpMsgBuf_utf8);
WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, size, lpMsgBuf_utf8, utf8_size, NULL, NULL);
WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, -1, lpMsgBuf_utf8, utf8_size, NULL, NULL);
git_buf_PUTS(&buf, ": ");
git_buf_puts(&buf, lpMsgBuf_utf8);

6
src/netops.c
View File

@ -46,10 +46,10 @@ static void net_set_error(const char *str)
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 = size * 4 + 1;
char * err_str_utf8 = git__calloc(utf8_size, sizeof(char));
int utf8_size = WideCharToMultiByte(CP_UTF8, 0, err_str, -1, NULL, 0, NULL, NULL);
char * err_str_utf8 = git__malloc(utf8_size * sizeof(char));
GITERR_CHECK_ALLOC(err_str_utf8);
WideCharToMultiByte(CP_UTF8, 0, err_str, size, err_str_utf8, utf8_size, NULL, NULL);
WideCharToMultiByte(CP_UTF8, 0, err_str, -1, err_str_utf8, utf8_size, NULL, NULL);
giterr_set(GITERR_NET, "%s: %s", str, err_str_utf8);
LocalFree(err_str);