minor nitpicks

This commit is contained in:
Will Greenberg
2023-11-08 17:15:13 -08:00
parent 1e8ab45b37
commit 102fe8d10e

View File

@@ -2,29 +2,21 @@ use std::fs::File;
use std::mem; use std::mem;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
fn main() { fn main() -> std::io::Result<()> {
const DIAG_IOCTL_SWITCH_LOGGING: u32 = 7; const DIAG_IOCTL_SWITCH_LOGGING: u32 = 7;
const MEMORY_DEVICE_MODE: i32 = 2; const MEMORY_DEVICE_MODE: i32 = 2;
const DIAG_IOCTL_REMOTE_DEV: u32 = 32; const DIAG_IOCTL_REMOTE_DEV: u32 = 32;
let mut mode_param: [i32; 3] = [MEMORY_DEVICE_MODE, -1, 0]; // diag_logging_mode_param_t let mut mode_param: [i32; 3] = [MEMORY_DEVICE_MODE, -1, 0]; // diag_logging_mode_param_t
let use_mdm: i32 = 0; let use_mdm: i32 = 0;
let diag_fd: i32;
println!("Initializing DIAG"); println!("Initializing DIAG");
let diag_result = File::options().read(true).write(true).open("/dev/diag"); let diag_file = File::options()
match &diag_result { .read(true)
Ok(file) => { .write(true)
diag_fd = file.as_raw_fd(); .open("/dev/diag")?;
} let diag_fd = diag_file.as_raw_fd();
Err(_) => {
println!("error opening diag device.");
std::process::exit(1);
}
}
unsafe { unsafe {
if libc::ioctl(diag_fd, DIAG_IOCTL_SWITCH_LOGGING, MEMORY_DEVICE_MODE, 0, 0, 0) < 0 if libc::ioctl(diag_fd, DIAG_IOCTL_SWITCH_LOGGING, MEMORY_DEVICE_MODE, 0, 0, 0) < 0
@@ -40,7 +32,6 @@ fn main() {
} }
} }
unsafe { unsafe {
if libc::ioctl(diag_fd, DIAG_IOCTL_REMOTE_DEV, &use_mdm as *const i32) < 0 { if libc::ioctl(diag_fd, DIAG_IOCTL_REMOTE_DEV, &use_mdm as *const i32) < 0 {
println!("ioctl failed 2"); println!("ioctl failed 2");
@@ -50,4 +41,5 @@ fn main() {
println!("successfully opened diag device"); println!("successfully opened diag device");
Ok(())
} }