From 69fa29cf91c8fd81392ea29cf415c8c7c9682d97 Mon Sep 17 00:00:00 2001 From: Giuliano Bellini s294739 Date: Wed, 13 Mar 2024 15:56:34 +0100 Subject: [PATCH] fix windows build failures --- src/platform/windows/mod.rs | 1 - src/platform/windows/tcp_listener.rs | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/platform/windows/mod.rs b/src/platform/windows/mod.rs index e1e1734..e7040f3 100644 --- a/src/platform/windows/mod.rs +++ b/src/platform/windows/mod.rs @@ -1,5 +1,4 @@ use crate::Listener; -use socket_table::SocketTable; use std::collections::HashSet; use tcp_listener::TcpListener; diff --git a/src/platform/windows/tcp_listener.rs b/src/platform/windows/tcp_listener.rs index 68fa3bd..1805923 100644 --- a/src/platform/windows/tcp_listener.rs +++ b/src/platform/windows/tcp_listener.rs @@ -48,7 +48,7 @@ impl TcpListener { fn pname(&self) -> Option { let pid = self.pid; - let h = unsafe { CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)? }; + let h = unsafe { CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0).ok()? }; let mut process = unsafe { zeroed::() }; process.dwSize = size_of::() as u32; @@ -66,14 +66,14 @@ impl TcpListener { } } - unsafe { CloseHandle(h)? }; + unsafe { CloseHandle(h).ok()? }; let name = process.szExeFile; let len = name.iter().position(|&x| x == 0)?; Some(String::from_utf8( name[0..len].iter().map(|e| *e as u8).collect(), - )?) + ).ok()?) } pub(super) fn to_listener(&self) -> Option {