From 102fe8d10e0c2e8cd0133418c0d49aaea3095de6 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Wed, 8 Nov 2023 17:15:13 -0800 Subject: [PATCH] minor nitpicks --- src/main.rs | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main.rs b/src/main.rs index 5a5c4e9..525bfd8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,29 +2,21 @@ use std::fs::File; use std::mem; use std::os::unix::io::AsRawFd; -fn main() { - const DIAG_IOCTL_SWITCH_LOGGING: u32 = 7; +fn main() -> std::io::Result<()> { + const DIAG_IOCTL_SWITCH_LOGGING: u32 = 7; const MEMORY_DEVICE_MODE: i32 = 2; const DIAG_IOCTL_REMOTE_DEV: u32 = 32; let mut mode_param: [i32; 3] = [MEMORY_DEVICE_MODE, -1, 0]; // diag_logging_mode_param_t let use_mdm: i32 = 0; - let diag_fd: i32; - println!("Initializing DIAG"); - let diag_result = File::options().read(true).write(true).open("/dev/diag"); - match &diag_result { - Ok(file) => { - diag_fd = file.as_raw_fd(); - } - Err(_) => { - println!("error opening diag device."); - std::process::exit(1); - } - } - + let diag_file = File::options() + .read(true) + .write(true) + .open("/dev/diag")?; + let diag_fd = diag_file.as_raw_fd(); unsafe { if libc::ioctl(diag_fd, DIAG_IOCTL_SWITCH_LOGGING, MEMORY_DEVICE_MODE, 0, 0, 0) < 0 @@ -40,7 +32,6 @@ fn main() { } } - unsafe { if libc::ioctl(diag_fd, DIAG_IOCTL_REMOTE_DEV, &use_mdm as *const i32) < 0 { println!("ioctl failed 2"); @@ -50,4 +41,5 @@ fn main() { println!("successfully opened diag device"); + Ok(()) }