95 lines
3.0 KiB
Diff
95 lines
3.0 KiB
Diff
From 6c285f5e9b99f99ce9c821f34f38800b36fc1312 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 046/N] warnings fixes
|
|
|
|
---
|
|
Modules/_winapi.c | 2 +-
|
|
Modules/posixmodule.c | 2 +-
|
|
Modules/socketmodule.h | 2 ++
|
|
PC/python_exe.rc | 2 +-
|
|
PC/pythonw_exe.rc | 2 +-
|
|
PC/winreg.c | 1 +
|
|
6 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
|
|
index b5d1468..abb32f0 100644
|
|
--- a/Modules/_winapi.c
|
|
+++ b/Modules/_winapi.c
|
|
@@ -1127,7 +1127,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 51b3e52..b326a14 100644
|
|
--- a/Modules/posixmodule.c
|
|
+++ b/Modules/posixmodule.c
|
|
@@ -6280,7 +6280,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;
|
|
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
|
|
index f5ca004..1e92327 100644
|
|
--- a/Modules/socketmodule.h
|
|
+++ b/Modules/socketmodule.h
|
|
@@ -68,8 +68,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 c3d3bff..dde0e53 100644
|
|
--- a/PC/python_exe.rc
|
|
+++ b/PC/python_exe.rc
|
|
@@ -12,7 +12,7 @@
|
|
// current versions of Windows.
|
|
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 38570b7..7ce1043 100644
|
|
--- a/PC/pythonw_exe.rc
|
|
+++ b/PC/pythonw_exe.rc
|
|
@@ -12,7 +12,7 @@
|
|
// current versions of Windows.
|
|
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 368291d..33ec8ff 100644
|
|
--- a/PC/winreg.c
|
|
+++ b/PC/winreg.c
|
|
@@ -831,6 +831,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) {
|
|
obData = Py_NewRef(Py_None);
|