Minor cleanup in SnapshotObject and HeapSnapshot.

vezel-dev · Jul 13, 2022 · e1eff22 · e1eff22
1 parent ab596e1
commit e1eff22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/system/HeapSnapshot.cs b/src/system/HeapSnapshot.cs
@@ -38,8 +38,10 @@ public IEnumerable<HeapBlockSnapshot> EnumerateHeapBlocks()
                 yield break;
             }
 
-            unsafe HeapBlockSnapshot? CreateHeapBlock()
+            static unsafe HeapBlockSnapshot CreateHeapBlock(in HEAPENTRY32 entry)
             {
+                // Cannot use unsafe code in iterators...
+
                 return new(
                     (int)entry.th32ProcessID,
                     (nint)entry.th32HeapID,
@@ -49,8 +51,7 @@ public IEnumerable<HeapBlockSnapshot> EnumerateHeapBlocks()
                     (HeapBlockSnapshotFlags)entry.dwFlags);
             }
 
-            if (CreateHeapBlock() is HeapBlockSnapshot heapBlock)
-                yield return heapBlock;
+            yield return CreateHeapBlock(entry);
 
             result = Win32.Heap32Next(ref entry);
         }

diff --git a/src/system/SnapshotObject.cs b/src/system/SnapshotObject.cs
@@ -51,7 +51,7 @@ public IEnumerable<ProcessSnapshot> EnumerateProcesses()
                 if (Marshal.GetLastPInvokeError() != (int)WIN32_ERROR.ERROR_NO_MORE_FILES)
                     throw new Win32Exception();
 
-                yield break;
+                break;
             }
 
             if (entry.dwSize == Unsafe.SizeOf<PROCESSENTRY32W>())
@@ -78,17 +78,18 @@ public IEnumerable<ModuleSnapshot> EnumerateModules()
                 if (Marshal.GetLastPInvokeError() != (int)WIN32_ERROR.ERROR_NO_MORE_FILES)
                     throw new Win32Exception();
 
-                yield break;
+                break;
             }
 
-            static ModuleSnapshot CreateModule(ref MODULEENTRY32W entry)
+            static ModuleSnapshot CreateModule(in MODULEENTRY32W entry)
             {
                 // Cannot use unsafe code in iterators...
+
                 return new((int)entry.th32ProcessID, entry.hModule, entry.modBaseAddr, (int)entry.modBaseSize);
             }
 
             if (entry.dwSize == Unsafe.SizeOf<MODULEENTRY32W>())
-                yield return CreateModule(ref entry);
+                yield return CreateModule(entry);
 
             result = Win32.Module32NextW(handle, ref entry);
         }
@@ -111,7 +112,7 @@ public IEnumerable<ThreadSnapshot> EnumerateThreads()
                 if (Marshal.GetLastPInvokeError() != (int)WIN32_ERROR.ERROR_NO_MORE_FILES)
                     throw new Win32Exception();
 
-                yield break;
+                break;
             }
 
             if (entry.dwSize == Unsafe.SizeOf<THREADENTRY32>())
@@ -138,7 +139,7 @@ public IEnumerable<HeapSnapshot> EnumerateHeaps()
                 if (Marshal.GetLastPInvokeError() != (int)WIN32_ERROR.ERROR_NO_MORE_FILES)
                     throw new Win32Exception();
 
-                yield break;
+                break;
             }
 
             if (entry.dwSize == (uint)Unsafe.SizeOf<HEAPLIST32>())