Skip to content

Commit

Permalink
bpo-40422: Move _Py_*_SUPPRESS_IPH bits into _Py_closerange (GH-22672)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kevans91 committed Oct 12, 2020
1 parent ba06a70 commit 64eb259
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Modules/posixmodule.c
Expand Up @@ -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;
Expand Down Expand Up @@ -8812,6 +8813,7 @@ _Py_closerange(int first, int last)
}
}
#endif /* USE_FDWALK */
_Py_END_SUPPRESS_IPH
}

/*[clinic input]
Expand All @@ -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;
}
Expand Down

0 comments on commit 64eb259

Please sign in to comment.