| From 2a8d3bf3a58d3caad9a27783240c25e9f720d137 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= |
| <alexey.pawlow@gmail.com> |
| Date: Thu, 17 Jun 2021 18:52:33 +0530 |
| Subject: [PATCH 090/N] warnings fixes |
| |
| --- |
| Modules/_winapi.c | 2 +- |
| Modules/posixmodule.c | 6 +++--- |
| Modules/socketmodule.h | 2 ++ |
| PC/python_exe.rc | 2 +- |
| PC/pythonw_exe.rc | 2 +- |
| PC/winreg.c | 1 + |
| Python/thread_nt.h | 3 ++- |
| 7 files changed, 11 insertions(+), 7 deletions(-) |
| |
| diff --git a/Modules/_winapi.c b/Modules/_winapi.c |
| index ba318a1..e4c7d11 100644 |
| --- a/Modules/_winapi.c |
| +++ b/Modules/_winapi.c |
| @@ -950,7 +950,7 @@ getattributelist(PyObject *obj, const char *name, AttributeList *attribute_list) |
| DWORD err; |
| BOOL result; |
| PyObject *value; |
| - Py_ssize_t handle_list_size; |
| + Py_ssize_t handle_list_size = 0; |
| DWORD attribute_count = 0; |
| SIZE_T attribute_list_size = 0; |
| |
| diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c |
| index bb1b81d..bf19ac8 100644 |
| --- a/Modules/posixmodule.c |
| +++ b/Modules/posixmodule.c |
| @@ -5343,7 +5343,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, |
| /*[clinic end generated code: output=cfcac69d027b82cf input=2fbd62a2f228f8f4]*/ |
| { |
| #ifdef MS_WINDOWS |
| - HANDLE hFile; |
| + HANDLE hFile = 0; |
| FILETIME atime, mtime; |
| #else |
| int result; |
| @@ -14360,7 +14360,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) |
| loaded. */ |
| Py_BEGIN_ALLOW_THREADS |
| if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || |
| - !(AddDllDirectory = (PAddDllDirectory)GetProcAddress( |
| + !(AddDllDirectory = (PAddDllDirectory)(void *)GetProcAddress( |
| hKernel32, "AddDllDirectory")) || |
| !(cookie = (*AddDllDirectory)(path->wide))) { |
| err = GetLastError(); |
| @@ -14410,7 +14410,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) |
| loaded. */ |
| Py_BEGIN_ALLOW_THREADS |
| if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || |
| - !(RemoveDllDirectory = (PRemoveDllDirectory)GetProcAddress( |
| + !(RemoveDllDirectory = (PRemoveDllDirectory)(void *)GetProcAddress( |
| hKernel32, "RemoveDllDirectory")) || |
| !(*RemoveDllDirectory)(cookieValue)) { |
| err = GetLastError(); |
| diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h |
| index ba2c9f5..81bad15 100644 |
| --- a/Modules/socketmodule.h |
| +++ b/Modules/socketmodule.h |
| @@ -70,8 +70,10 @@ struct SOCKADDR_BTH_REDEF { |
| */ |
| # ifdef SIO_GET_MULTICAST_FILTER |
| # include <mstcpip.h> /* for SIO_RCVALL */ |
| +#ifndef __MINGW32__ /* resolve by configure */ |
| # define HAVE_ADDRINFO |
| # define HAVE_SOCKADDR_STORAGE |
| +#endif |
| # define HAVE_GETADDRINFO |
| # define HAVE_GETNAMEINFO |
| # define ENABLE_IPV6 |
| diff --git a/PC/python_exe.rc b/PC/python_exe.rc |
| index ae0b029..e667ffa 100644 |
| --- a/PC/python_exe.rc |
| +++ b/PC/python_exe.rc |
| @@ -7,7 +7,7 @@ |
| #include <winuser.h> |
| 1 RT_MANIFEST "python.manifest" |
| |
| -1 ICON DISCARDABLE "icons\python.ico" |
| +1 ICON DISCARDABLE "icons/python.ico" |
| |
| |
| ///////////////////////////////////////////////////////////////////////////// |
| diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc |
| index 88bf359..413d7d1 100644 |
| --- a/PC/pythonw_exe.rc |
| +++ b/PC/pythonw_exe.rc |
| @@ -7,7 +7,7 @@ |
| #include <winuser.h> |
| 1 RT_MANIFEST "python.manifest" |
| |
| -1 ICON DISCARDABLE "icons\pythonw.ico" |
| +1 ICON DISCARDABLE "icons/pythonw.ico" |
| |
| |
| ///////////////////////////////////////////////////////////////////////////// |
| diff --git a/PC/winreg.c b/PC/winreg.c |
| index b6f1a8f..19cc104 100644 |
| --- a/PC/winreg.c |
| +++ b/PC/winreg.c |
| @@ -809,6 +809,7 @@ Reg2Py(BYTE *retDataBuf, DWORD retDataSize, DWORD typ) |
| case REG_BINARY: |
| /* ALSO handle ALL unknown data types here. Even if we can't |
| support it natively, we should handle the bits. */ |
| + /* fallthrough */ |
| default: |
| if (retDataSize == 0) { |
| Py_INCREF(Py_None); |
| diff --git a/Python/thread_nt.h b/Python/thread_nt.h |
| index 0ce5e94..6a6fe7e 100644 |
| --- a/Python/thread_nt.h |
| +++ b/Python/thread_nt.h |
| @@ -349,8 +349,9 @@ PyThread_release_lock(PyThread_type_lock aLock) |
| { |
| dprintf(("%lu: PyThread_release_lock(%p) called\n", PyThread_get_thread_ident(),aLock)); |
| |
| - if (!(aLock && LeaveNonRecursiveMutex((PNRMUTEX) aLock))) |
| + if (!(aLock && LeaveNonRecursiveMutex((PNRMUTEX) aLock))) { |
| dprintf(("%lu: Could not PyThread_release_lock(%p) error: %ld\n", PyThread_get_thread_ident(), aLock, GetLastError())); |
| + } |
| } |
| |
| /* minimum/maximum thread stack sizes supported */ |
| -- |
| 2.32.0 |
| |