mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
After de8feb1f3a23465b5737e8a8c160e8ca62f61339, 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.
This commit is contained in:
Peter Eisentraut 2020-10-21 08:17:51 +02:00
parent 19ae53c92d
commit 8a58347a3c
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/libpq/auth.c
View File

@ -1521,7 +1521,7 @@ pg_SSPI_recvauth(Port *port)
(errmsg("could not load library \"%s\": error code %lu", (errmsg("could not load library \"%s\": error code %lu",
"SECUR32.DLL", GetLastError()))); "SECUR32.DLL", GetLastError())));
_QuerySecurityContextToken = (QUERY_SECURITY_CONTEXT_TOKEN_FN) _QuerySecurityContextToken = (QUERY_SECURITY_CONTEXT_TOKEN_FN) (pg_funcptr_t)
GetProcAddress(secur32, "QuerySecurityContextToken"); GetProcAddress(secur32, "QuerySecurityContextToken");
if (_QuerySecurityContextToken == NULL) if (_QuerySecurityContextToken == NULL)
{ {
@ -2522,7 +2522,7 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
ldap_unbind(*ldap); ldap_unbind(*ldap);
return STATUS_ERROR; 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) if (_ldap_start_tls_sA == NULL)
{ {
ereport(LOG, ereport(LOG,

2
src/backend/port/win32/crashdump.c
View File

@ -122,7 +122,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS *pExceptionInfo)
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
} }
pDump = (MINIDUMPWRITEDUMP) GetProcAddress(hDll, "MiniDumpWriteDump"); pDump = (MINIDUMPWRITEDUMP) (pg_funcptr_t) GetProcAddress(hDll, "MiniDumpWriteDump");
if (pDump == NULL) if (pDump == NULL)
{ {

12
src/bin/pg_ctl/pg_ctl.c
View File

@ -1778,7 +1778,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
Advapi32Handle = LoadLibrary("ADVAPI32.DLL"); Advapi32Handle = LoadLibrary("ADVAPI32.DLL");
if (Advapi32Handle != NULL) if (Advapi32Handle != NULL)
{ {
_CreateRestrictedToken = (__CreateRestrictedToken) GetProcAddress(Advapi32Handle, "CreateRestrictedToken"); _CreateRestrictedToken = (__CreateRestrictedToken) (pg_funcptr_t) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");
} }
if (_CreateRestrictedToken == NULL) if (_CreateRestrictedToken == NULL)
@ -1852,11 +1852,11 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
Kernel32Handle = LoadLibrary("KERNEL32.DLL"); Kernel32Handle = LoadLibrary("KERNEL32.DLL");
if (Kernel32Handle != NULL) if (Kernel32Handle != NULL)
{ {
_IsProcessInJob = (__IsProcessInJob) GetProcAddress(Kernel32Handle, "IsProcessInJob"); _IsProcessInJob = (__IsProcessInJob) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "IsProcessInJob");
_CreateJobObject = (__CreateJobObject) GetProcAddress(Kernel32Handle, "CreateJobObjectA"); _CreateJobObject = (__CreateJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "CreateJobObjectA");
_SetInformationJobObject = (__SetInformationJobObject) GetProcAddress(Kernel32Handle, "SetInformationJobObject"); _SetInformationJobObject = (__SetInformationJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "SetInformationJobObject");
_AssignProcessToJobObject = (__AssignProcessToJobObject) GetProcAddress(Kernel32Handle, "AssignProcessToJobObject"); _AssignProcessToJobObject = (__AssignProcessToJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "AssignProcessToJobObject");
_QueryInformationJobObject = (__QueryInformationJobObject) GetProcAddress(Kernel32Handle, "QueryInformationJobObject"); _QueryInformationJobObject = (__QueryInformationJobObject) (pg_funcptr_t) GetProcAddress(Kernel32Handle, "QueryInformationJobObject");
} }
/* Verify that we found all functions */ /* Verify that we found all functions */

2
src/common/restricted_token.c
View File

@ -66,7 +66,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo)
return 0; return 0;
} }
_CreateRestrictedToken = (__CreateRestrictedToken) GetProcAddress(Advapi32Handle, "CreateRestrictedToken"); _CreateRestrictedToken = (__CreateRestrictedToken) (pg_funcptr_t) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");
if (_CreateRestrictedToken == NULL) if (_CreateRestrictedToken == NULL)
{ {

2
src/interfaces/ecpg/test/expected/thread-thread.c
View File

@ -99,7 +99,7 @@ int main()
#ifndef WIN32 #ifndef WIN32
pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1)); pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
#else #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 #endif
} }

2
src/interfaces/ecpg/test/expected/thread-thread_implicit.c
View File

@ -99,7 +99,7 @@ int main()
#ifndef WIN32 #ifndef WIN32
pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1)); pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
#else #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 #endif
} }

2
src/interfaces/ecpg/test/thread/thread.pgc
View File

@ -68,7 +68,7 @@ int main()
#ifndef WIN32 #ifndef WIN32
pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1)); pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
#else #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 #endif
} }

2
src/interfaces/ecpg/test/thread/thread_implicit.pgc
View File

@ -68,7 +68,7 @@ int main()
#ifndef WIN32 #ifndef WIN32
pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1)); pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
#else #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 #endif
} }

6
src/port/getaddrinfo.c
View File

@ -79,11 +79,11 @@ haveNativeWindowsIPv6routines(void)
{ {
/* We found a dll, so now get the addresses of the routines */ /* We found a dll, so now get the addresses of the routines */
getaddrinfo_ptr = (getaddrinfo_ptr_t) GetProcAddress(hLibrary, getaddrinfo_ptr = (getaddrinfo_ptr_t) (pg_funcptr_t) GetProcAddress(hLibrary,
"getaddrinfo"); "getaddrinfo");
freeaddrinfo_ptr = (freeaddrinfo_ptr_t) GetProcAddress(hLibrary, freeaddrinfo_ptr = (freeaddrinfo_ptr_t) (pg_funcptr_t) GetProcAddress(hLibrary,
"freeaddrinfo"); "freeaddrinfo");
getnameinfo_ptr = (getnameinfo_ptr_t) GetProcAddress(hLibrary, getnameinfo_ptr = (getnameinfo_ptr_t) (pg_funcptr_t) GetProcAddress(hLibrary,
"getnameinfo"); "getnameinfo");
/* /*

2
src/port/win32env.c
View File

@ -95,7 +95,7 @@ pgwin32_putenv(const char *envval)
{ {
PUTENVPROC putenvFunc; PUTENVPROC putenvFunc;
putenvFunc = (PUTENVPROC) GetProcAddress(hmodule, "_putenv"); putenvFunc = (PUTENVPROC) (pg_funcptr_t) GetProcAddress(hmodule, "_putenv");
if (putenvFunc) if (putenvFunc)
putenvFunc(envval); putenvFunc(envval);
FreeLibrary(hmodule); FreeLibrary(hmodule);

2
src/port/win32stat.c
View File

@ -227,7 +227,7 @@ _pgstat64(const char *name, struct stat *buf)
return -1; return -1;
} }
_NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE) _NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE) (pg_funcptr_t)
GetProcAddress(ntdll, "NtQueryInformationFile"); GetProcAddress(ntdll, "NtQueryInformationFile");
if (_NtQueryInformationFile == NULL) if (_NtQueryInformationFile == NULL)
{ {