Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

driver: wrap fd returned from nsm_init in Option #54

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/driver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,19 @@ pub fn nsm_process_request(fd: i32, request: Request) -> Response {
}

/// NSM library initialization function.
/// *Returns*: A descriptor for the opened device file.
pub fn nsm_init() -> i32 {
/// *Returns*: A descriptor for the opened device file, if successful.
pub fn nsm_init() -> Option<i32> {
let mut open_options = OpenOptions::new();
let open_dev = open_options.read(true).write(true).open(DEV_FILE);

match open_dev {
Ok(open_dev) => {
debug!("Device file '{}' opened successfully.", DEV_FILE);
open_dev.into_raw_fd()
Some(open_dev.into_raw_fd())

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Semantically, this should be a Result.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally agreed, but this is the pattern used in this repo. I was trying to make it as appetizing as possible for the maintainers. I'm happy to change it though. (Are you in a position to merge this PR?)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not 🙂

}
Err(e) => {
error!("Device file '{}' failed to open: {}", DEV_FILE, e);
-1
None
}
}
}
Expand Down