proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 20:29:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1041 from pwkelley/transports

Browse Source 
Prefer GetLastError() for GITERR_OS on Win32
This commit is contained in:
Philip Kelley 2012-11-02 08:40:09 -07:00
commit 2c087f81e1
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/errors.c
View File

@ -41,51 +41,40 @@ void giterr_set(int error_class, const char *string, ...)
git_buf buf = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT;
va_list arglist; va_list arglist;
int unix_error_code = 0;
#ifdef GIT_WIN32
DWORD win32_error_code = 0;
#endif
if (error_class == GITERR_OS) {
unix_error_code = errno;
errno = 0;
#ifdef GIT_WIN32
win32_error_code = GetLastError();
SetLastError(0);
#endif
}
va_start(arglist, string); va_start(arglist, string);
git_buf_vprintf(&buf, string, arglist); git_buf_vprintf(&buf, string, arglist);
va_end(arglist); va_end(arglist);
/* automatically suffix strerror(errno) for GITERR_OS errors */
if (error_class == GITERR_OS) { if (error_class == GITERR_OS) {
int error_code = errno;
if (unix_error_code != 0) {
git_buf_PUTS(&buf, ": ");
git_buf_puts(&buf, strerror(unix_error_code));
}
#ifdef GIT_WIN32 #ifdef GIT_WIN32
else if (win32_error_code != 0) { DWORD win32_error_code = GetLastError();
LPVOID lpMsgBuf = NULL;
FormatMessage( if (win32_error_code) {
FORMAT_MESSAGE_ALLOCATE_BUFFER | char *lpMsgBuf;
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, win32_error_code, 0, (LPTSTR) &lpMsgBuf, 0, NULL);
if (lpMsgBuf) { if (FormatMessageA(
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, win32_error_code, 0, (LPSTR)&lpMsgBuf, 0, NULL)) {
git_buf_PUTS(&buf, ": "); git_buf_PUTS(&buf, ": ");
git_buf_puts(&buf, lpMsgBuf); git_buf_puts(&buf, lpMsgBuf);
LocalFree(lpMsgBuf); LocalFree(lpMsgBuf);
} }
SetLastError(0);
} }
else
#endif #endif
if (error_code) {
git_buf_PUTS(&buf, ": ");
git_buf_puts(&buf, strerror(error_code));
}
if (error_code)
errno = 0;
} }
if (!git_buf_oom(&buf)) if (!git_buf_oom(&buf))