use pid_t type

6 files changed, 21 insertions, 21 deletions

diff --git a/psutil/arch/windows/process_handles.h b/psutil/arch/windows/process_handles.h
index d1be3152..a53e7114 100644
--- a/psutil/arch/windows/process_handles.h
+++ b/psutil/arch/windows/process_handles.h
@@ -7,4 +7,4 @@
 #include <Python.h>
 #include <windows.h>
 
-PyObject* psutil_get_open_files(DWORD pid, HANDLE hProcess);
+PyObject* psutil_get_open_files(pid_t pid, HANDLE hProcess);
diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c
index 64ff0f0d..a7533df0 100644
--- a/psutil/arch/windows/process_info.c
+++ b/psutil/arch/windows/process_info.c
@@ -58,7 +58,7 @@ enum psutil_process_data_kind {
  * -1 is returned, and an appropriate Python exception is set.
  */
 static int
-psutil_get_process_data(long pid,
+psutil_get_process_data(pid_t pid,
                         enum psutil_process_data_kind kind,
                         WCHAR **pdata,
                         SIZE_T *psize) {
@@ -377,7 +377,7 @@ error:
  * AccessDenied. Requires Windows 8.1+.
  */
 static int
-psutil_cmdline_query_proc(long pid, WCHAR **pdata, SIZE_T *psize) {
+psutil_cmdline_query_proc(pid_t pid, WCHAR **pdata, SIZE_T *psize) {
     HANDLE hProcess = NULL;
     ULONG bufLen = 0;
     NTSTATUS status;
@@ -470,7 +470,7 @@ error:
  * with given pid or NULL on error.
  */
 PyObject *
-psutil_get_cmdline(long pid, int use_peb) {
+psutil_get_cmdline(pid_t pid, int use_peb) {
     PyObject *ret = NULL;
     WCHAR *data = NULL;
     SIZE_T size;
@@ -531,7 +531,7 @@ out:
 
 
 PyObject *
-psutil_get_cwd(long pid) {
+psutil_get_cwd(pid_t pid) {
     PyObject *ret = NULL;
     WCHAR *data = NULL;
     SIZE_T size;
@@ -555,7 +555,7 @@ out:
  * process with given pid or NULL on error.
  */
 PyObject *
-psutil_get_environ(long pid) {
+psutil_get_environ(pid_t pid) {
     PyObject *ret = NULL;
     WCHAR *data = NULL;
     SIZE_T size;
@@ -582,7 +582,7 @@ out:
  * On success return 1, else 0 with Python exception already set.
  */
 int
-psutil_get_proc_info(DWORD pid, PSYSTEM_PROCESS_INFORMATION *retProcess,
+psutil_get_proc_info(pid_t pid, PSYSTEM_PROCESS_INFORMATION *retProcess,
                      PVOID *retBuffer) {
     static ULONG initialBufferSize = 0x4000;
     NTSTATUS status;
@@ -662,7 +662,7 @@ error:
  */
 PyObject *
 psutil_proc_info(PyObject *self, PyObject *args) {
-    DWORD pid;
+    pid_t pid;
     PSYSTEM_PROCESS_INFORMATION process;
     PVOID buffer;
     ULONG i;
diff --git a/psutil/arch/windows/process_info.h b/psutil/arch/windows/process_info.h
index 5fe342b3..f1bb2f39 100644
--- a/psutil/arch/windows/process_info.h
+++ b/psutil/arch/windows/process_info.h
@@ -13,9 +13,9 @@
    (PSYSTEM_PROCESS_INFORMATION)((PCHAR)(Process) + \
         ((PSYSTEM_PROCESS_INFORMATION)(Process))->NextEntryOffset) : NULL)
 
-int psutil_get_proc_info(DWORD pid, PSYSTEM_PROCESS_INFORMATION *retProcess,
+int psutil_get_proc_info(pid_t pid, PSYSTEM_PROCESS_INFORMATION *retProcess,
                          PVOID *retBuffer);
-PyObject* psutil_get_cmdline(long pid, int use_peb);
-PyObject* psutil_get_cwd(long pid);
-PyObject* psutil_get_environ(long pid);
+PyObject* psutil_get_cmdline(pid_t pid, int use_peb);
+PyObject* psutil_get_cwd(pid_t pid);
+PyObject* psutil_get_environ(pid_t pid);
 PyObject* psutil_proc_info(PyObject *self, PyObject *args);
diff --git a/psutil/arch/windows/process_utils.c b/psutil/arch/windows/process_utils.c
index dbdebd48..43d46b32 100644
--- a/psutil/arch/windows/process_utils.c
+++ b/psutil/arch/windows/process_utils.c
@@ -55,7 +55,7 @@ psutil_get_pids(DWORD *numberOfReturnedPIDs) {
 
 // Return 1 if PID exists, 0 if not, -1 on error.
 int
-psutil_pid_in_pids(DWORD pid) {
+psutil_pid_in_pids(pid_t pid) {
     DWORD *proclist = NULL;
     DWORD numberOfReturnedPIDs;
     DWORD i;
@@ -78,7 +78,7 @@ psutil_pid_in_pids(DWORD pid) {
 // does return the handle, else return NULL with Python exception set.
 // This is needed because OpenProcess API sucks.
 HANDLE
-psutil_check_phandle(HANDLE hProcess, DWORD pid) {
+psutil_check_phandle(HANDLE hProcess, pid_t pid) {
     DWORD exitCode;
 
     if (hProcess == NULL) {
@@ -122,7 +122,7 @@ psutil_check_phandle(HANDLE hProcess, DWORD pid) {
 // argument to OpenProcess.
 // Return a process handle or NULL with exception set.
 HANDLE
-psutil_handle_from_pid(DWORD pid, DWORD access) {
+psutil_handle_from_pid(pid_t pid, DWORD access) {
     HANDLE hProcess;
 
     if (pid == 0) {
@@ -144,7 +144,7 @@ psutil_handle_from_pid(DWORD pid, DWORD access) {
 
 // Check for PID existance. Return 1 if pid exists, 0 if not, -1 on error.
 int
-psutil_pid_is_running(DWORD pid) {
+psutil_pid_is_running(pid_t pid) {
     HANDLE hProcess;
 
     // Special case for PID 0 System Idle Process
diff --git a/psutil/arch/windows/process_utils.h b/psutil/arch/windows/process_utils.h
index a7171c5c..38187cec 100644
--- a/psutil/arch/windows/process_utils.h
+++ b/psutil/arch/windows/process_utils.h
@@ -5,7 +5,7 @@
  */
 
 DWORD* psutil_get_pids(DWORD *numberOfReturnedPIDs);
-HANDLE psutil_handle_from_pid(DWORD pid, DWORD dwDesiredAccess);
-int psutil_pid_is_running(DWORD pid);
-int psutil_assert_pid_exists(DWORD pid, char *err);
-int psutil_assert_pid_not_exists(DWORD pid, char *err);
+HANDLE psutil_handle_from_pid(pid_t pid, DWORD dwDesiredAccess);
+int psutil_pid_is_running(pid_t pid);
+int psutil_assert_pid_exists(pid_t pid, char *err);
+int psutil_assert_pid_not_exists(pid_t pid, char *err);
diff --git a/psutil/arch/windows/socks.c b/psutil/arch/windows/socks.c
index 5272e127..0da0852b 100644
--- a/psutil/arch/windows/socks.c
+++ b/psutil/arch/windows/socks.c
@@ -113,7 +113,7 @@ static DWORD __GetExtendedUdpTable(TYPE_GetExtendedUdpTable call,
 PyObject *
 psutil_net_connections(PyObject *self, PyObject *args) {
     static long null_address[4] = { 0, 0, 0, 0 };
-    unsigned long pid;
+    pid_t pid;
     int pid_return;
     PVOID table = NULL;
     DWORD tableSize;