bpo-40422: Move _Py_*_SUPPRESS_IPH bits into _Py_closerange (GH-22672)

kevans91 · web-flow · commit 64eb259cc1e4 · 2020-10-12T16:53:16.000-07:00
This suppression is no longer needed in os_closerange_impl, as it just
invokes the internal _Py_closerange implementation. On the other hand,
consumers of _Py_closerange may not have any other reason to suppress
invalid parameter issues, so narrow the scope to here.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -8782,6 +8782,7 @@ void
 _Py_closerange(int first, int last)
 {
     first = Py_MAX(first, 0);
+    _Py_BEGIN_SUPPRESS_IPH
 #ifdef HAVE_CLOSE_RANGE
     if (close_range(first, last, 0) == 0 || errno != ENOSYS) {
         /* Any errors encountered while closing file descriptors are ignored;
@@ -8812,6 +8813,7 @@ _Py_closerange(int first, int last)
         }
     }
 #endif /* USE_FDWALK */
+    _Py_END_SUPPRESS_IPH
 }
 
 /*[clinic input]
@@ -8829,9 +8831,7 @@ os_closerange_impl(PyObject *module, int fd_low, int fd_high)
 /*[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]*/
 {
     Py_BEGIN_ALLOW_THREADS
-    _Py_BEGIN_SUPPRESS_IPH
     _Py_closerange(fd_low, fd_high - 1);
-    _Py_END_SUPPRESS_IPH
     Py_END_ALLOW_THREADS
     Py_RETURN_NONE;
 }

Original file line number	Diff line number	Diff line change
`@@ -8782,6 +8782,7 @@ void`
`8782`	`8782`	`_Py_closerange(int first, int last)`
`8783`	`8783`	`{`
`8784`	`8784`	`first = Py_MAX(first, 0);`
	`8785`	`+ _Py_BEGIN_SUPPRESS_IPH`
`8785`	`8786`	`#ifdef HAVE_CLOSE_RANGE`
`8786`	`8787`	`if (close_range(first, last, 0) == 0 \|\| errno != ENOSYS) {`
`8787`	`8788`	`/* Any errors encountered while closing file descriptors are ignored;`
`@@ -8812,6 +8813,7 @@ _Py_closerange(int first, int last)`
`8812`	`8813`	`}`
`8813`	`8814`	`}`
`8814`	`8815`	`#endif /* USE_FDWALK */`
	`8816`	`+ _Py_END_SUPPRESS_IPH`
`8815`	`8817`	`}`
`8816`	`8818`
`8817`	`8819`	`/*[clinic input]`
`@@ -8829,9 +8831,7 @@ os_closerange_impl(PyObject *module, int fd_low, int fd_high)`
`8829`	`8831`	`/[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]/`
`8830`	`8832`	`{`
`8831`	`8833`	`Py_BEGIN_ALLOW_THREADS`
`8832`		`- _Py_BEGIN_SUPPRESS_IPH`
`8833`	`8834`	`_Py_closerange(fd_low, fd_high - 1);`
`8834`		`- _Py_END_SUPPRESS_IPH`
`8835`	`8835`	`Py_END_ALLOW_THREADS`
`8836`	`8836`	`Py_RETURN_NONE;`
`8837`	`8837`	`}`