Merge issue #26355 fix from Python 3.5

1 files changed, 43 insertions, 24 deletions

diff --git a/PC/clinic/msvcrtmodule.c.h b/PC/clinic/msvcrtmodule.c.h
index e7a72c47f6..6935cad7b0 100644
--- a/PC/clinic/msvcrtmodule.c.h
+++ b/PC/clinic/msvcrtmodule.c.h
@@ -51,8 +51,9 @@ msvcrt_locking(PyObject *module, PyObject *args)
     long nbytes;
 
     if (!PyArg_ParseTuple(args, "iil:locking",
-        &fd, &mode, &nbytes))
+        &fd, &mode, &nbytes)) {
         goto exit;
+    }
     return_value = msvcrt_locking_impl(module, fd, mode, nbytes);
 
 exit:
@@ -85,11 +86,13 @@ msvcrt_setmode(PyObject *module, PyObject *args)
     long _return_value;
 
     if (!PyArg_ParseTuple(args, "ii:setmode",
-        &fd, &flags))
+        &fd, &flags)) {
         goto exit;
+    }
     _return_value = msvcrt_setmode_impl(module, fd, flags);
-    if ((_return_value == -1) && PyErr_Occurred())
+    if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
+    }
     return_value = PyLong_FromLong(_return_value);
 
 exit:
@@ -110,22 +113,24 @@ PyDoc_STRVAR(msvcrt_open_osfhandle__doc__,
     {"open_osfhandle", (PyCFunction)msvcrt_open_osfhandle, METH_VARARGS, msvcrt_open_osfhandle__doc__},
 
 static long
-msvcrt_open_osfhandle_impl(PyObject *module, Py_intptr_t handle, int flags);
+msvcrt_open_osfhandle_impl(PyObject *module, intptr_t handle, int flags);
 
 static PyObject *
 msvcrt_open_osfhandle(PyObject *module, PyObject *args)
 {
     PyObject *return_value = NULL;
-    Py_intptr_t handle;
+    intptr_t handle;
     int flags;
     long _return_value;
 
     if (!PyArg_ParseTuple(args, ""_Py_PARSE_INTPTR"i:open_osfhandle",
-        &handle, &flags))
+        &handle, &flags)) {
         goto exit;
+    }
     _return_value = msvcrt_open_osfhandle_impl(module, handle, flags);
-    if ((_return_value == -1) && PyErr_Occurred())
+    if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
+    }
     return_value = PyLong_FromLong(_return_value);
 
 exit:
@@ -143,7 +148,7 @@ PyDoc_STRVAR(msvcrt_get_osfhandle__doc__,
 #define MSVCRT_GET_OSFHANDLE_METHODDEF    \
     {"get_osfhandle", (PyCFunction)msvcrt_get_osfhandle, METH_O, msvcrt_get_osfhandle__doc__},
 
-static Py_intptr_t
+static intptr_t
 msvcrt_get_osfhandle_impl(PyObject *module, int fd);
 
 static PyObject *
@@ -151,13 +156,15 @@ msvcrt_get_osfhandle(PyObject *module, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int fd;
-    Py_intptr_t _return_value;
+    intptr_t _return_value;
 
-    if (!PyArg_Parse(arg, "i:get_osfhandle", &fd))
+    if (!PyArg_Parse(arg, "i:get_osfhandle", &fd)) {
         goto exit;
+    }
     _return_value = msvcrt_get_osfhandle_impl(module, fd);
-    if ((_return_value == -1) && PyErr_Occurred())
+    if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
+    }
     return_value = PyLong_FromVoidPtr((void *)_return_value);
 
 exit:
@@ -183,8 +190,9 @@ msvcrt_kbhit(PyObject *module, PyObject *Py_UNUSED(ignored))
     long _return_value;
 
     _return_value = msvcrt_kbhit_impl(module);
-    if ((_return_value == -1) && PyErr_Occurred())
+    if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
+    }
     return_value = PyLong_FromLong(_return_value);
 
 exit:
@@ -311,8 +319,9 @@ msvcrt_putch(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     char char_value;
 
-    if (!PyArg_Parse(arg, "c:putch", &char_value))
+    if (!PyArg_Parse(arg, "c:putch", &char_value)) {
         goto exit;
+    }
     return_value = msvcrt_putch_impl(module, char_value);
 
 exit:
@@ -337,8 +346,9 @@ msvcrt_putwch(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     int unicode_char;
 
-    if (!PyArg_Parse(arg, "C:putwch", &unicode_char))
+    if (!PyArg_Parse(arg, "C:putwch", &unicode_char)) {
         goto exit;
+    }
     return_value = msvcrt_putwch_impl(module, unicode_char);
 
 exit:
@@ -367,8 +377,9 @@ msvcrt_ungetch(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     char char_value;
 
-    if (!PyArg_Parse(arg, "c:ungetch", &char_value))
+    if (!PyArg_Parse(arg, "c:ungetch", &char_value)) {
         goto exit;
+    }
     return_value = msvcrt_ungetch_impl(module, char_value);
 
 exit:
@@ -393,8 +404,9 @@ msvcrt_ungetwch(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     int unicode_char;
 
-    if (!PyArg_Parse(arg, "C:ungetwch", &unicode_char))
+    if (!PyArg_Parse(arg, "C:ungetwch", &unicode_char)) {
         goto exit;
+    }
     return_value = msvcrt_ungetwch_impl(module, unicode_char);
 
 exit:
@@ -426,11 +438,13 @@ msvcrt_CrtSetReportFile(PyObject *module, PyObject *args)
     long _return_value;
 
     if (!PyArg_ParseTuple(args, "ii:CrtSetReportFile",
-        &type, &file))
+        &type, &file)) {
         goto exit;
+    }
     _return_value = msvcrt_CrtSetReportFile_impl(module, type, file);
-    if ((_return_value == -1) && PyErr_Occurred())
+    if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
+    }
     return_value = PyLong_FromLong(_return_value);
 
 exit:
@@ -464,11 +478,13 @@ msvcrt_CrtSetReportMode(PyObject *module, PyObject *args)
     long _return_value;
 
     if (!PyArg_ParseTuple(args, "ii:CrtSetReportMode",
-        &type, &mode))
+        &type, &mode)) {
         goto exit;
+    }
     _return_value = msvcrt_CrtSetReportMode_impl(module, type, mode);
-    if ((_return_value == -1) && PyErr_Occurred())
+    if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
+    }
     return_value = PyLong_FromLong(_return_value);
 
 exit:
@@ -500,11 +516,13 @@ msvcrt_set_error_mode(PyObject *module, PyObject *arg)
     int mode;
     long _return_value;
 
-    if (!PyArg_Parse(arg, "i:set_error_mode", &mode))
+    if (!PyArg_Parse(arg, "i:set_error_mode", &mode)) {
         goto exit;
+    }
     _return_value = msvcrt_set_error_mode_impl(module, mode);
-    if ((_return_value == -1) && PyErr_Occurred())
+    if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
+    }
     return_value = PyLong_FromLong(_return_value);
 
 exit:
@@ -531,8 +549,9 @@ msvcrt_SetErrorMode(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     unsigned int mode;
 
-    if (!PyArg_Parse(arg, "I:SetErrorMode", &mode))
+    if (!PyArg_Parse(arg, "I:SetErrorMode", &mode)) {
         goto exit;
+    }
     return_value = msvcrt_SetErrorMode_impl(module, mode);
 
 exit:
@@ -550,4 +569,4 @@ exit:
 #ifndef MSVCRT_SET_ERROR_MODE_METHODDEF
     #define MSVCRT_SET_ERROR_MODE_METHODDEF
 #endif /* !defined(MSVCRT_SET_ERROR_MODE_METHODDEF) */
-/*[clinic end generated code: output=2a794c520d6ae887 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ae04e2b50eef8b63 input=a9049054013a1b77]*/