windows / c: small refactoring

1 files changed, 5 insertions, 10 deletions

diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c
index bfcbe624..a871282c 100644
--- a/psutil/arch/windows/process_info.c
+++ b/psutil/arch/windows/process_info.c
@@ -93,8 +93,7 @@ psutil_get_pids(DWORD *numberOfReturnedPIDs) {
         }
         if (! EnumProcesses(procArray, procArrayByteSz, &enumReturnSz)) {
             free(procArray);
-            PyErr_SetFromWindowsErr(0);
-            return NULL;
+            return PyErr_SetFromWindowsErr(0);
         }
     } while (enumReturnSz == procArraySz * sizeof(DWORD));
 
@@ -138,8 +137,7 @@ psutil_pid_is_running(DWORD pid) {
         // Be strict and raise an exception; the caller is supposed
         // to take -1 into account.
         else {
-            PyErr_SetFromWindowsErr(0);
-            return -1;
+            return PyErr_SetFromWindowsErr(err);
         }
     }
 
@@ -154,13 +152,10 @@ psutil_pid_is_running(DWORD pid) {
         CloseHandle(hProcess);
         // Same as for OpenProcess, assume access denied means there's
         // a process to deny access to.
-        if (err == ERROR_ACCESS_DENIED) {
+        if (err == ERROR_ACCESS_DENIED)
             return 1;
-        }
-        else {
-            PyErr_SetFromWindowsErr(err);
-            return -1;
-        }
+        else
+            return PyErr_SetFromWindowsErr(err);
     }
 }