Merge branch 'js/gcc-8-and-9' into jch

gitster · gitster · commit be21fa8de325 · 2019-07-09T12:41:34.000-07:00
Code clean-up for new compilers.

* js/gcc-8-and-9:
  config: avoid calling `labs()` on too-large data type
  winansi: simplify loading the GetCurrentConsoleFontEx() function
  kwset: allow building with GCC 8
  poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
@@ -149,7 +149,7 @@ win32_compute_revents (HANDLE h, int *p_sought)
     case FILE_TYPE_PIPE:
       if (!once_only)
 	{
-	  NtQueryInformationFile = (PNtQueryInformationFile)
+	  NtQueryInformationFile = (PNtQueryInformationFile)(void (*)(void))
 	    GetProcAddress (GetModuleHandle ("ntdll.dll"),
 			    "NtQueryInformationFile");
 	  once_only = TRUE;
diff --git a/compat/winansi.c b/compat/winansi.c
@@ -7,6 +7,7 @@
 #include <wingdi.h>
 #include <winreg.h>
 #include "win32.h"
+#include "win32/lazyload.h"
 
 static int fd_is_interactive[3] = { 0, 0, 0 };
 #define FD_CONSOLE 0x1
@@ -41,26 +42,21 @@ typedef struct _CONSOLE_FONT_INFOEX {
 #endif
 #endif
 
-typedef BOOL (WINAPI *PGETCURRENTCONSOLEFONTEX)(HANDLE, BOOL,
-		PCONSOLE_FONT_INFOEX);
-
 static void warn_if_raster_font(void)
 {
 	DWORD fontFamily = 0;
-	PGETCURRENTCONSOLEFONTEX pGetCurrentConsoleFontEx;
+	DECLARE_PROC_ADDR(kernel32.dll, BOOL, GetCurrentConsoleFontEx,
+			HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
 
 	/* don't bother if output was ascii only */
 	if (!non_ascii_used)
 		return;
 
 	/* GetCurrentConsoleFontEx is available since Vista */
-	pGetCurrentConsoleFontEx = (PGETCURRENTCONSOLEFONTEX) GetProcAddress(
-			GetModuleHandle("kernel32.dll"),
-			"GetCurrentConsoleFontEx");
-	if (pGetCurrentConsoleFontEx) {
+	if (INIT_PROC_ADDR(GetCurrentConsoleFontEx)) {
 		CONSOLE_FONT_INFOEX cfi;
 		cfi.cbSize = sizeof(cfi);
-		if (pGetCurrentConsoleFontEx(console, 0, &cfi))
+		if (GetCurrentConsoleFontEx(console, 0, &cfi))
 			fontFamily = cfi.FontFamily;
 	} else {
 		/* pre-Vista: check default console font in registry */
diff --git a/config.c b/config.c
@@ -896,9 +896,9 @@ static int git_parse_signed(const char *value, intmax_t *ret, intmax_t max)
 			errno = EINVAL;
 			return 0;
 		}
-		uval = labs(val);
+		uval = val < 0 ? -val : val;
 		uval *= factor;
-		if (uval > max || labs(val) > uval) {
+		if (uval > max || (val < 0 ? -val : val) > uval) {
 			errno = ERANGE;
 			return 0;
 		}
diff --git a/kwset.c b/kwset.c
@@ -38,7 +38,13 @@
 #include "compat/obstack.h"
 
 #define NCHAR (UCHAR_MAX + 1)
-#define obstack_chunk_alloc xmalloc
+/* adapter for `xmalloc()`, which takes `size_t`, not `long` */
+static void *obstack_chunk_alloc(long size)
+{
+	if (size < 0)
+		BUG("Cannot allocate a negative amount: %ld", size);
+	return xmalloc(size);
+}
 #define obstack_chunk_free free
 
 #define U(c) ((unsigned char) (c))

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ win32_compute_revents (HANDLE h, int *p_sought)`
`149`	`149`	`case FILE_TYPE_PIPE:`
`150`	`150`	`if (!once_only)`
`151`	`151`	`{`
`152`		`- NtQueryInformationFile = (PNtQueryInformationFile)`
	`152`	`+ NtQueryInformationFile = (PNtQueryInformationFile)(void (*)(void))`
`153`	`153`	`GetProcAddress (GetModuleHandle ("ntdll.dll"),`
`154`	`154`	`"NtQueryInformationFile");`
`155`	`155`	`once_only = TRUE;`
Original file line number	Diff line number	Diff line change
`@@ -896,9 +896,9 @@ static int git_parse_signed(const char value, intmax_t ret, intmax_t max)`
`896`	`896`	`errno = EINVAL;`
`897`	`897`	`return 0;`
`898`	`898`	`}`
`899`		`- uval = labs(val);`
	`899`	`+ uval = val < 0 ? -val : val;`
`900`	`900`	`uval *= factor;`
`901`		`- if (uval > max \|\| labs(val) > uval) {`
	`901`	`+ if (uval > max \|\| (val < 0 ? -val : val) > uval) {`
`902`	`902`	`errno = ERANGE;`
`903`	`903`	`return 0;`
`904`	`904`	`}`