diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-03-14 18:38:27 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-14 18:38:27 (GMT) |
| commit | 41e7244c062e5acbb10582d12d3a03caa892f435 (patch) | |
| tree | 93cb4d77d5c2534d345ef267bce2b05e0162fac3 | |
| parent | 0d70ab6b8c1f4a391546b6a41a2ab441cf0b6c27 (diff) | |
| download | cpython-41e7244c062e5acbb10582d12d3a03caa892f435.zip cpython-41e7244c062e5acbb10582d12d3a03caa892f435.tar.gz cpython-41e7244c062e5acbb10582d12d3a03caa892f435.tar.bz2 | |
Fixes incorrect use of GetLastError where errno should be used.
| -rw-r--r-- | Python/fileutils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index 901a746..31689c0 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -593,7 +593,7 @@ get_inheritable(int fd, int raise) handle = (HANDLE)_get_osfhandle(fd); if (handle == INVALID_HANDLE_VALUE) { if (raise) - PyErr_SetFromWindowsErr(0); + PyErr_SetFromErrno(PyExc_OSError); return -1; } @@ -648,10 +648,10 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works) if (atomic_flag_works != NULL && !inheritable) { if (*atomic_flag_works == -1) { - int inheritable = get_inheritable(fd, raise); - if (inheritable == -1) + int isInheritable = get_inheritable(fd, raise); + if (isInheritable == -1) return -1; - *atomic_flag_works = !inheritable; + *atomic_flag_works = !isInheritable; } if (*atomic_flag_works) @@ -668,7 +668,7 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works) handle = (HANDLE)_get_osfhandle(fd); if (handle == INVALID_HANDLE_VALUE) { if (raise) - PyErr_SetFromWindowsErr(0); + PyErr_SetFromErrno(PyExc_OSError); return -1; } @@ -1027,7 +1027,7 @@ _Py_dup(int fd) #ifdef MS_WINDOWS handle = (HANDLE)_get_osfhandle(fd); if (handle == INVALID_HANDLE_VALUE) { - PyErr_SetFromWindowsErr(0); + PyErr_SetFromErrno(PyExc_OSError); return -1; } |