summaryrefslogtreecommitdiff
path: root/psutil
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2023-04-19 14:42:01 -0700
committerGiampaolo Rodola <g.rodola@gmail.com>2023-04-19 14:42:01 -0700
commit7389b4874d5685daa869eff6166dda7491a6ab10 (patch)
tree2ac4d1b4a38b6c61f282ca50f2e63e0c6dc37bb8 /psutil
parent08c24c0767a83faaa8fd9e1fb54723b6dc78f00c (diff)
parentaeceeb74b7bdd2d6f5769f9dfcce9256ddd7832c (diff)
downloadpsutil-7389b4874d5685daa869eff6166dda7491a6ab10.tar.gz
win, C, refact: rename process_*.c files to proc_*.cwin-c-refact
Diffstat (limited to 'psutil')
-rw-r--r--psutil/_psutil_windows.c6
-rw-r--r--psutil/arch/windows/proc.c13
-rw-r--r--psutil/arch/windows/proc_handles.c (renamed from psutil/arch/windows/process_handles.c)2
-rw-r--r--psutil/arch/windows/proc_handles.h (renamed from psutil/arch/windows/process_handles.h)0
-rw-r--r--psutil/arch/windows/proc_info.c (renamed from psutil/arch/windows/process_info.c)4
-rw-r--r--psutil/arch/windows/proc_info.h (renamed from psutil/arch/windows/process_info.h)0
-rw-r--r--psutil/arch/windows/proc_utils.c (renamed from psutil/arch/windows/process_utils.c)2
-rw-r--r--psutil/arch/windows/proc_utils.h (renamed from psutil/arch/windows/process_utils.h)0
-rw-r--r--psutil/arch/windows/socks.c2
9 files changed, 18 insertions, 11 deletions
diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
index 272e39a8..54678f75 100644
--- a/psutil/_psutil_windows.c
+++ b/psutil/_psutil_windows.c
@@ -23,9 +23,9 @@
#include "arch/windows/mem.h"
#include "arch/windows/net.h"
#include "arch/windows/proc.h"
-#include "arch/windows/process_handles.h"
-#include "arch/windows/process_info.h"
-#include "arch/windows/process_utils.h"
+#include "arch/windows/proc_handles.h"
+#include "arch/windows/proc_info.h"
+#include "arch/windows/proc_utils.h"
#include "arch/windows/security.h"
#include "arch/windows/sensors.h"
#include "arch/windows/services.h"
diff --git a/psutil/arch/windows/proc.c b/psutil/arch/windows/proc.c
index fb5f7bb9..d9b69744 100644
--- a/psutil/arch/windows/proc.c
+++ b/psutil/arch/windows/proc.c
@@ -4,6 +4,13 @@
* found in the LICENSE file.
*/
+/*
+ * Process related functions. Original code was moved in here from
+ * psutil/_psutil_windows.c in 2023. For reference, here's the GIT blame
+ * history before the move:
+ * https://github.com/giampaolo/psutil/blame/59504a5/psutil/_psutil_windows.c
+*/
+
// Fixes clash between winsock2.h and windows.h
#define WIN32_LEAN_AND_MEAN
@@ -18,9 +25,9 @@
#include "../../_psutil_common.h"
#include "proc.h"
-#include "process_info.h"
-#include "process_handles.h"
-#include "process_utils.h"
+#include "proc_info.h"
+#include "proc_handles.h"
+#include "proc_utils.h"
// Raised by Process.wait().
diff --git a/psutil/arch/windows/process_handles.c b/psutil/arch/windows/proc_handles.c
index 72e3f4d4..30e7cd2d 100644
--- a/psutil/arch/windows/process_handles.c
+++ b/psutil/arch/windows/proc_handles.c
@@ -23,7 +23,7 @@
#include <Python.h>
#include "../../_psutil_common.h"
-#include "process_utils.h"
+#include "proc_utils.h"
#define THREAD_TIMEOUT 100 // ms
diff --git a/psutil/arch/windows/process_handles.h b/psutil/arch/windows/proc_handles.h
index d1be3152..d1be3152 100644
--- a/psutil/arch/windows/process_handles.h
+++ b/psutil/arch/windows/proc_handles.h
diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/proc_info.c
index 7a227d4d..5d16b813 100644
--- a/psutil/arch/windows/process_info.c
+++ b/psutil/arch/windows/proc_info.c
@@ -11,8 +11,8 @@
#include <windows.h>
#include "../../_psutil_common.h"
-#include "process_info.h"
-#include "process_utils.h"
+#include "proc_info.h"
+#include "proc_utils.h"
#ifndef _WIN64
diff --git a/psutil/arch/windows/process_info.h b/psutil/arch/windows/proc_info.h
index b7795451..b7795451 100644
--- a/psutil/arch/windows/process_info.h
+++ b/psutil/arch/windows/proc_info.h
diff --git a/psutil/arch/windows/process_utils.c b/psutil/arch/windows/proc_utils.c
index f9d4bbc8..dac1129c 100644
--- a/psutil/arch/windows/process_utils.c
+++ b/psutil/arch/windows/proc_utils.c
@@ -11,7 +11,7 @@
#include <Psapi.h> // EnumProcesses
#include "../../_psutil_common.h"
-#include "process_utils.h"
+#include "proc_utils.h"
DWORD *
diff --git a/psutil/arch/windows/process_utils.h b/psutil/arch/windows/proc_utils.h
index dca7c991..dca7c991 100644
--- a/psutil/arch/windows/process_utils.h
+++ b/psutil/arch/windows/proc_utils.h
diff --git a/psutil/arch/windows/socks.c b/psutil/arch/windows/socks.c
index 5e4c2df8..0dc77f2d 100644
--- a/psutil/arch/windows/socks.c
+++ b/psutil/arch/windows/socks.c
@@ -12,7 +12,7 @@
#include <ws2tcpip.h>
#include "../../_psutil_common.h"
-#include "process_utils.h"
+#include "proc_utils.h"
#define BYTESWAP_USHORT(x) ((((USHORT)(x) << 8) | ((USHORT)(x) >> 8)) & 0xffff)