development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

mingw: avoid warnings when casting HANDLEs to int

Browse source 
HANDLE is defined internally as a void *, but in many cases it is
actually guaranteed to be a 32-bit integer. In these cases, GCC should
not warn about a cast of a pointer to an integer of a different type
because we know exactly what we are doing.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2016-01-15 14:24:34 +01:00 committed by Junio C Hamano
parent 59de49f80d
commit 7c00bc39eb
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
compat/mingw.c
View file

@ -6,6 +6,8 @@
#include "../run-command.h" #include "../run-command.h"
#include "../cache.h" #include "../cache.h"
#define HCAST(type, handle) ((type)(intptr_t)handle)
static const int delay[] = { 0, 1, 10, 20, 40 }; static const int delay[] = { 0, 1, 10, 20, 40 };
int err_win_to_posix(DWORD winerr) int err_win_to_posix(DWORD winerr)
@ -691,13 +693,13 @@ int pipe(int filedes[2])
errno = err_win_to_posix(GetLastError()); errno = err_win_to_posix(GetLastError());
return -1; return -1;
} }
filedes[0] = _open_osfhandle((int)h[0], O_NOINHERIT); filedes[0] = _open_osfhandle(HCAST(int, h[0]), O_NOINHERIT);
if (filedes[0] < 0) { if (filedes[0] < 0) {
CloseHandle(h[0]); CloseHandle(h[0]);
CloseHandle(h[1]); CloseHandle(h[1]);
return -1; return -1;
} }
filedes[1] = _open_osfhandle((int)h[1], O_NOINHERIT); filedes[1] = _open_osfhandle(HCAST(int, h[1]), O_NOINHERIT);
if (filedes[1] < 0) { if (filedes[1] < 0) {
close(filedes[0]); close(filedes[0]);
CloseHandle(h[1]); CloseHandle(h[1]);
@ -1846,7 +1848,8 @@ void mingw_open_html(const char *unixpath)
die("cannot run browser"); die("cannot run browser");
printf("Launching default browser to display HTML ...\n"); printf("Launching default browser to display HTML ...\n");
r = (int)ShellExecute(NULL, "open", htmlpath, NULL, "\\", SW_SHOWNORMAL); r = HCAST(int, ShellExecute(NULL, "open", htmlpath,
NULL, "\\", SW_SHOWNORMAL));
FreeLibrary(shell32); FreeLibrary(shell32);
/* see the MSDN documentation referring to the result codes here */ /* see the MSDN documentation referring to the result codes here */
if (r <= 32) { if (r <= 32) {

2
compat/poll/poll.c
View file

@ -76,7 +76,7 @@
#ifdef WIN32_NATIVE #ifdef WIN32_NATIVE
#define IsConsoleHandle(h) (((long) (h) & 3) == 3) #define IsConsoleHandle(h) (((long) (intptr_t) (h) & 3) == 3)
static BOOL static BOOL
IsSocketHandle (HANDLE h) IsSocketHandle (HANDLE h)

3
compat/winansi.c
View file

@ -454,7 +454,8 @@ static HANDLE duplicate_handle(HANDLE hnd)
HANDLE hresult, hproc = GetCurrentProcess(); HANDLE hresult, hproc = GetCurrentProcess();
if (!DuplicateHandle(hproc, hnd, hproc, &hresult, 0, TRUE, if (!DuplicateHandle(hproc, hnd, hproc, &hresult, 0, TRUE,
DUPLICATE_SAME_ACCESS)) DUPLICATE_SAME_ACCESS))
die_lasterr("DuplicateHandle(%li) failed", (long) hnd); die_lasterr("DuplicateHandle(%li) failed",
(long) (intptr_t) hnd);
return hresult; return hresult;
} }