Apply suggestions from code review

ameily · zooba · ameily · commit f42270d1230f · 2021-10-02T08:41:42.000-04:00
Co-authored-by: Steve Dower &lt;steve.dower@microsoft.com&gt;
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
@@ -1326,8 +1326,8 @@ static PyObject *format_error(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "|L:FormatError", &code))
         return NULL;
 
-    if(code < LONG_MIN || code > ULONG_MAX) {
-        PyErr_SetString(PyExc_OverflowError, "int doesn't fit in long");
+    if((DWORD)code != code) {
+        PyErr_Format(PyExc_OverflowError, "error code %lld too big for int", code);
         return NULL;
     }
 
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -854,7 +854,7 @@ oserror_parse_args(PyObject **p_args,
                 return -1;
 
             if(winerrcode < LONG_MIN || winerrcode > ULONG_MAX) {
-                PyErr_SetString(PyExc_OverflowError, "int doesn't fit in long");
+                PyErr_Format(PyExc_OverflowError, "error code %lld too big for int", winerrcode);
                 return -1;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1326,8 +1326,8 @@ static PyObject format_error(PyObject self, PyObject *args)`
`1326`	`1326`	`if (!PyArg_ParseTuple(args, "\|L:FormatError", &code))`
`1327`	`1327`	`return NULL;`
`1328`	`1328`
`1329`		`- if(code < LONG_MIN \|\| code > ULONG_MAX) {`
`1330`		`- PyErr_SetString(PyExc_OverflowError, "int doesn't fit in long");`
	`1329`	`+ if((DWORD)code != code) {`
	`1330`	`+ PyErr_Format(PyExc_OverflowError, "error code %lld too big for int", code);`
`1331`	`1331`	`return NULL;`
`1332`	`1332`	`}`
`1333`	`1333`
Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ oserror_parse_args(PyObject **p_args,`
`854`	`854`	`return -1;`
`855`	`855`
`856`	`856`	`if(winerrcode < LONG_MIN \|\| winerrcode > ULONG_MAX) {`
`857`		`- PyErr_SetString(PyExc_OverflowError, "int doesn't fit in long");`
	`857`	`+ PyErr_Format(PyExc_OverflowError, "error code %lld too big for int", winerrcode);`
`858`	`858`	`return -1;`
`859`	`859`	`}`
`860`	`860`