diff --git a/src/interrupt.rs b/src/interrupt.rs index c400d84..7bdbc0a 100644 --- a/src/interrupt.rs +++ b/src/interrupt.rs @@ -20,14 +20,14 @@ extern "C" fn sonar_signal_handler(_: libc::c_int) { pub fn handle_interruptions() { unsafe { let nomask : libc::sigset_t = std::mem::zeroed(); - let mut action = libc::sigaction { + let action = libc::sigaction { sa_sigaction: sonar_signal_handler as usize, sa_mask: nomask, sa_flags: 0, sa_restorer: None, }; - libc::sigaction(libc::SIGTERM, &mut action, std::ptr::null_mut()); - libc::sigaction(libc::SIGHUP, &mut action, std::ptr::null_mut()); + libc::sigaction(libc::SIGTERM, &action, std::ptr::null_mut()); + libc::sigaction(libc::SIGHUP, &action, std::ptr::null_mut()); } } diff --git a/src/procfsapi.rs b/src/procfsapi.rs index 287abfb..cb14687 100644 --- a/src/procfsapi.rs +++ b/src/procfsapi.rs @@ -58,14 +58,12 @@ impl ProcfsAPI for RealFS { fn read_proc_pids(&self) -> Result, String> { let mut pids = vec![]; if let Ok(dir) = fs::read_dir("/proc") { - for dirent in dir { - if let Ok(dirent) = dirent { - if let Ok(meta) = dirent.metadata() { - let uid = meta.st_uid(); - if let Some(name) = dirent.path().file_name() { - if let Ok(pid) = name.to_string_lossy().parse::() { - pids.push((pid, uid)); - } + for dirent in dir.flatten() { + if let Ok(meta) = dirent.metadata() { + let uid = meta.st_uid(); + if let Some(name) = dirent.path().file_name() { + if let Ok(pid) = name.to_string_lossy().parse::() { + pids.push((pid, uid)); } } } diff --git a/src/ps.rs b/src/ps.rs index 6e8a7fa..cdfa03f 100644 --- a/src/ps.rs +++ b/src/ps.rs @@ -672,7 +672,7 @@ fn print_record( } s += "\n"; - writer.write(s.as_bytes())?; + let _ = writer.write(s.as_bytes())?; Ok(true) } diff --git a/src/time.rs b/src/time.rs index a73275d..b5bc2df 100644 --- a/src/time.rs +++ b/src/time.rs @@ -28,7 +28,7 @@ pub fn now_iso8601() -> String { unsafe { let t = libc::time(std::ptr::null_mut()); - if libc::localtime_r(&t, &mut timebuf) == std::ptr::null_mut() { + if libc::localtime_r(&t, &mut timebuf).is_null() { panic!("localtime_r"); }