Fix -Wcast-function-type warnings on Windows/MinGW

petere · petere · commit 8a58347a3c10 · 2020-10-21T08:17:51.000+02:00
After de8feb1, some warnings remained that were only visible when using GCC on Windows. Fix those as well. Note that the ecpg test source files don't use the full pg_config.h, so we can't use pg_funcptr_t there but have to do it the long way.
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
@@ -1521,7 +1521,7 @@ pg_SSPI_recvauth(Port *port)
 				(errmsg("could not load library \"%s\": error code %lu",
 						"SECUR32.DLL", GetLastError())));
 
-	_QuerySecurityContextToken = (QUERY_SECURITY_CONTEXT_TOKEN_FN)
+	_QuerySecurityContextToken = (QUERY_SECURITY_CONTEXT_TOKEN_FN) (pg_funcptr_t)
 		GetProcAddress(secur32, "QuerySecurityContextToken");
 	if (_QuerySecurityContextToken == NULL)
 	{
@@ -2522,7 +2522,7 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
 				ldap_unbind(*ldap);
 				return STATUS_ERROR;
 			}
-			_ldap_start_tls_sA = (__ldap_start_tls_sA) GetProcAddress(ldaphandle, "ldap_start_tls_sA");
+			_ldap_start_tls_sA = (__ldap_start_tls_sA) (pg_funcptr_t) GetProcAddress(ldaphandle, "ldap_start_tls_sA");
 			if (_ldap_start_tls_sA == NULL)
 			{
 				ereport(LOG,
diff --git a/src/backend/port/win32/crashdump.c b/src/backend/port/win32/crashdump.c
@@ -122,7 +122,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS *pExceptionInfo)
 			return EXCEPTION_CONTINUE_SEARCH;
 		}
 
-		pDump = (MINIDUMPWRITEDUMP) GetProcAddress(hDll, "MiniDumpWriteDump");
+		pDump = (MINIDUMPWRITEDUMP) (pg_funcptr_t) GetProcAddress(hDll, "MiniDumpWriteDump");
 
 		if (pDump == NULL)
 		{
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -1778,7 +1778,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 	Advapi32Handle = LoadLibrary("ADVAPI32.DLL");
 	if (Advapi32Handle != NULL)
 	{
-		_CreateRestrictedToken = (__CreateRestrictedToken) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");
+		_CreateRestrictedToken = (__CreateRestrictedToken) (pg_funcptr_t) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");
 	}
 
 	if (_CreateRestrictedToken == NULL)
@@ -1852,11 +1852,11 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 	Kernel32Handle = LoadLibrary("KERNEL32.DLL");
 	if (Kernel32Handle != NULL)
 	{
-		_IsProcessInJob = (__IsProcessInJob) GetProcAddress(Kernel32Handle, "IsProcessInJob");
-		_CreateJobObject = (__CreateJobObject) GetProcAddress(Kernel32Handle, "CreateJobObjectA");
-		_SetInformationJobObject = (__SetInformationJobObject) GetProcAddress(Kernel32Handle, "SetInformationJobObject");
-		_AssignProcessToJobObject = (__AssignProcessToJobObject) GetProcAddress(Kernel32Handle, "AssignProcessToJobObject");
-		_QueryInformationJobObject = (__QueryInformationJobObject) GetProcAddress(Kernel32Handle, "QueryInformationJobObject");
+		_IsProcessInJob = (__IsProcessInJob) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "IsProcessInJob");
+		_CreateJobObject = (__CreateJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "CreateJobObjectA");
+		_SetInformationJobObject = (__SetInformationJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "SetInformationJobObject");
+		_AssignProcessToJobObject = (__AssignProcessToJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "AssignProcessToJobObject");
+		_QueryInformationJobObject = (__QueryInformationJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "QueryInformationJobObject");
 	}
 
 	/* Verify that we found all functions */
diff --git a/src/common/restricted_token.c b/src/common/restricted_token.c
@@ -66,7 +66,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo)
 		return 0;
 	}
 
-	_CreateRestrictedToken = (__CreateRestrictedToken) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");
+	_CreateRestrictedToken = (__CreateRestrictedToken) (pg_funcptr_t) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");
 
 	if (_CreateRestrictedToken == NULL)
 	{
diff --git a/src/interfaces/ecpg/test/expected/thread-thread.c b/src/interfaces/ecpg/test/expected/thread-thread.c
@@ -99,7 +99,7 @@ int main()
 #ifndef WIN32
       pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
 #else
-      threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)test_thread, (void *) (n + 1), 0, NULL);
+      threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) (void (*) (void)) test_thread, (void *) (n + 1), 0, NULL);
 #endif
     }
 
diff --git a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c
@@ -99,7 +99,7 @@ int main()
 #ifndef WIN32
       pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
 #else
-      threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) test_thread, (void *) (n+1), 0, NULL);
+      threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) (void (*) (void)) test_thread, (void *) (n+1), 0, NULL);
 #endif
     }
 
diff --git a/src/interfaces/ecpg/test/thread/thread.pgc b/src/interfaces/ecpg/test/thread/thread.pgc
@@ -68,7 +68,7 @@ int main()
 #ifndef WIN32
       pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
 #else
-      threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)test_thread, (void *) (n + 1), 0, NULL);
+      threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) (void (*) (void)) test_thread, (void *) (n + 1), 0, NULL);
 #endif
     }
 
diff --git a/src/interfaces/ecpg/test/thread/thread_implicit.pgc b/src/interfaces/ecpg/test/thread/thread_implicit.pgc
@@ -68,7 +68,7 @@ int main()
 #ifndef WIN32
       pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
 #else
-      threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) test_thread, (void *) (n+1), 0, NULL);
+      threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) (void (*) (void)) test_thread, (void *) (n+1), 0, NULL);
 #endif
     }
 
diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c
@@ -79,12 +79,12 @@ haveNativeWindowsIPv6routines(void)
 	{
 		/* We found a dll, so now get the addresses of the routines */
 
-		getaddrinfo_ptr = (getaddrinfo_ptr_t) GetProcAddress(hLibrary,
-															 "getaddrinfo");
-		freeaddrinfo_ptr = (freeaddrinfo_ptr_t) GetProcAddress(hLibrary,
-															   "freeaddrinfo");
-		getnameinfo_ptr = (getnameinfo_ptr_t) GetProcAddress(hLibrary,
-															 "getnameinfo");
+		getaddrinfo_ptr = (getaddrinfo_ptr_t) (pg_funcptr_t) GetProcAddress(hLibrary,
+																			"getaddrinfo");
+		freeaddrinfo_ptr = (freeaddrinfo_ptr_t) (pg_funcptr_t) GetProcAddress(hLibrary,
+																			  "freeaddrinfo");
+		getnameinfo_ptr = (getnameinfo_ptr_t) (pg_funcptr_t) GetProcAddress(hLibrary,
+																			"getnameinfo");
 
 		/*
 		 * If any one of the routines is missing, let's play it safe and
diff --git a/src/port/win32env.c b/src/port/win32env.c
@@ -95,7 +95,7 @@ pgwin32_putenv(const char *envval)
 		{
 			PUTENVPROC	putenvFunc;
 
-			putenvFunc = (PUTENVPROC) GetProcAddress(hmodule, "_putenv");
+			putenvFunc = (PUTENVPROC) (pg_funcptr_t) GetProcAddress(hmodule, "_putenv");
 			if (putenvFunc)
 				putenvFunc(envval);
 			FreeLibrary(hmodule);
diff --git a/src/port/win32stat.c b/src/port/win32stat.c
@@ -227,7 +227,7 @@ _pgstat64(const char *name, struct stat *buf)
 			return -1;
 		}
 
-		_NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE)
+		_NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE) (pg_funcptr_t)
 			GetProcAddress(ntdll, "NtQueryInformationFile");
 		if (_NtQueryInformationFile == NULL)
 		{

Original file line number	Diff line number	Diff line change
`@@ -1521,7 +1521,7 @@ pg_SSPI_recvauth(Port *port)`
`1521`	`1521`	`(errmsg("could not load library \"%s\": error code %lu",`
`1522`	`1522`	`"SECUR32.DLL", GetLastError())));`
`1523`	`1523`
`1524`		`- _QuerySecurityContextToken = (QUERY_SECURITY_CONTEXT_TOKEN_FN)`
	`1524`	`+ _QuerySecurityContextToken = (QUERY_SECURITY_CONTEXT_TOKEN_FN) (pg_funcptr_t)`
`1525`	`1525`	`GetProcAddress(secur32, "QuerySecurityContextToken");`
`1526`	`1526`	`if (_QuerySecurityContextToken == NULL)`
`1527`	`1527`	`{`
`@@ -2522,7 +2522,7 @@ InitializeLDAPConnection(Port port, LDAP *ldap)`
`2522`	`2522`	`ldap_unbind(*ldap);`
`2523`	`2523`	`return STATUS_ERROR;`
`2524`	`2524`	`}`
`2525`		`- _ldap_start_tls_sA = (__ldap_start_tls_sA) GetProcAddress(ldaphandle, "ldap_start_tls_sA");`
	`2525`	`+ _ldap_start_tls_sA = (__ldap_start_tls_sA) (pg_funcptr_t) GetProcAddress(ldaphandle, "ldap_start_tls_sA");`
`2526`	`2526`	`if (_ldap_start_tls_sA == NULL)`
`2527`	`2527`	`{`
`2528`	`2528`	`ereport(LOG,`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS *pExceptionInfo)`
`122`	`122`	`return EXCEPTION_CONTINUE_SEARCH;`
`123`	`123`	`}`
`124`	`124`
`125`		`- pDump = (MINIDUMPWRITEDUMP) GetProcAddress(hDll, "MiniDumpWriteDump");`
	`125`	`+ pDump = (MINIDUMPWRITEDUMP) (pg_funcptr_t) GetProcAddress(hDll, "MiniDumpWriteDump");`
`126`	`126`
`127`	`127`	`if (pDump == NULL)`
`128`	`128`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1778,7 +1778,7 @@ CreateRestrictedProcess(char cmd, PROCESS_INFORMATION processInfo, bool as_ser`
`1778`	`1778`	`Advapi32Handle = LoadLibrary("ADVAPI32.DLL");`
`1779`	`1779`	`if (Advapi32Handle != NULL)`
`1780`	`1780`	`{`
`1781`		`- _CreateRestrictedToken = (__CreateRestrictedToken) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");`
	`1781`	`+ _CreateRestrictedToken = (__CreateRestrictedToken) (pg_funcptr_t) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");`
`1782`	`1782`	`}`
`1783`	`1783`
`1784`	`1784`	`if (_CreateRestrictedToken == NULL)`
`@@ -1852,11 +1852,11 @@ CreateRestrictedProcess(char cmd, PROCESS_INFORMATION processInfo, bool as_ser`
`1852`	`1852`	`Kernel32Handle = LoadLibrary("KERNEL32.DLL");`
`1853`	`1853`	`if (Kernel32Handle != NULL)`
`1854`	`1854`	`{`
`1855`		`- _IsProcessInJob = (__IsProcessInJob) GetProcAddress(Kernel32Handle, "IsProcessInJob");`
`1856`		`- _CreateJobObject = (__CreateJobObject) GetProcAddress(Kernel32Handle, "CreateJobObjectA");`
`1857`		`- _SetInformationJobObject = (__SetInformationJobObject) GetProcAddress(Kernel32Handle, "SetInformationJobObject");`
`1858`		`- _AssignProcessToJobObject = (__AssignProcessToJobObject) GetProcAddress(Kernel32Handle, "AssignProcessToJobObject");`
`1859`		`- _QueryInformationJobObject = (__QueryInformationJobObject) GetProcAddress(Kernel32Handle, "QueryInformationJobObject");`
	`1855`	`+ _IsProcessInJob = (__IsProcessInJob) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "IsProcessInJob");`
	`1856`	`+ _CreateJobObject = (__CreateJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "CreateJobObjectA");`
	`1857`	`+ _SetInformationJobObject = (__SetInformationJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "SetInformationJobObject");`
	`1858`	`+ _AssignProcessToJobObject = (__AssignProcessToJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "AssignProcessToJobObject");`
	`1859`	`+ _QueryInformationJobObject = (__QueryInformationJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "QueryInformationJobObject");`
`1860`	`1860`	`}`
`1861`	`1861`
`1862`	`1862`	`/* Verify that we found all functions */`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ CreateRestrictedProcess(char cmd, PROCESS_INFORMATION processInfo)`
`66`	`66`	`return 0;`
`67`	`67`	`}`
`68`	`68`
`69`		`- _CreateRestrictedToken = (__CreateRestrictedToken) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");`
	`69`	`+ _CreateRestrictedToken = (__CreateRestrictedToken) (pg_funcptr_t) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");`
`70`	`70`
`71`	`71`	`if (_CreateRestrictedToken == NULL)`
`72`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ int main()`
`99`	`99`	`#ifndef WIN32`
`100`	`100`	`pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));`
`101`	`101`	`#else`
`102`		`- threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)test_thread, (void *) (n + 1), 0, NULL);`
	`102`	`+ threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) (void () (void)) test_thread, (void ) (n + 1), 0, NULL);`
`103`	`103`	`#endif`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ int main()`
`68`	`68`	`#ifndef WIN32`
`69`	`69`	`pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));`
`70`	`70`	`#else`
`71`		`- threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)test_thread, (void *) (n + 1), 0, NULL);`
	`71`	`+ threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) (void () (void)) test_thread, (void ) (n + 1), 0, NULL);`
`72`	`72`	`#endif`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ pgwin32_putenv(const char *envval)`
`95`	`95`	`{`
`96`	`96`	`PUTENVPROC putenvFunc;`
`97`	`97`
`98`		`- putenvFunc = (PUTENVPROC) GetProcAddress(hmodule, "_putenv");`
	`98`	`+ putenvFunc = (PUTENVPROC) (pg_funcptr_t) GetProcAddress(hmodule, "_putenv");`
`99`	`99`	`if (putenvFunc)`
`100`	`100`	`putenvFunc(envval);`
`101`	`101`	`FreeLibrary(hmodule);`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ _pgstat64(const char name, struct stat buf)`
`227`	`227`	`return -1;`
`228`	`228`	`}`
`229`	`229`
`230`		`- _NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE)`
	`230`	`+ _NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE) (pg_funcptr_t)`
`231`	`231`	`GetProcAddress(ntdll, "NtQueryInformationFile");`
`232`	`232`	`if (_NtQueryInformationFile == NULL)`
`233`	`233`	`{`