Commit 5661358

RenTrieuphip1611

and

authored

uefi: Revise comments to be more descriptive and use macros for CStr16

Co-authored-by: Philipp Schuster <phip1611@gmail.com>

1 parent 42cad4a commit 5661358Copy full SHA for 5661358

File tree

2 files changed

-6

lines changed

uefi-test-runner/src/proto
- shell.rs
uefi/src/proto/shell
- mod.rs

2 files changed

-6

lines changed

`‎uefi-test-runner/src/proto/shell.rs`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ pub fn test_env(shell: &ScopedProtocol<Shell>) {`
`25`	`25`	`/* Test setting and getting a specific environment variable */`
`26`	`26`	`let cur_env_vec = shell.get_envs();`
`27`	`27`	`let mut test_env_buf = [0u16; 32];`
`28`		`- let test_var = CStr16::from_str_with_buf("test_var",&mut test_env_buf).unwrap();`
	`28`	`+ let test_var = cstr16!("test_var");`
`29`	`29`	`let mut test_val_buf = [0u16; 32];`
`30`		`- let test_val = CStr16::from_str_with_buf("test_val",&mut test_val_buf).unwrap();`
	`30`	`+ let test_val = cstr16!("test_val");`
`31`	`31`	`assert!(shell.get_env(test_var).is_none());`
`32`	`32`	`let status = shell.set_env(test_var, test_val, false);`
`33`	`33`	`assert_eq!(status, Status::SUCCESS);`
`@@ -56,7 +56,7 @@ pub fn test_env(shell: &ScopedProtocol<Shell>) {`
`56`	`56`	`assert_eq!(cur_env_vec.count(), default_len + 1);`
`57`	`57`
`58`	`58`	`/* Test deleting environment variable */`
`59`		`- let test_val = CStr16::from_str_with_buf("",&mut test_val_buf).unwrap();`
	`59`	`+ let test_val = cstr16!("");`
`60`	`60`	`let status = shell.set_env(test_var, test_val, false);`
`61`	`61`	`assert_eq!(status, Status::SUCCESS);`
`62`	`62`	`assert!(shell.get_env(test_var).is_none());`
`@@ -73,13 +73,13 @@ pub fn test_env(shell: &ScopedProtocol<Shell>) {`
`73`	`73`	`assert_eq!(cur_env_vec.count(), default_len);`
`74`	`74`	`}`
`75`	`75`
`76`		-/// Test ``get_cur_dir()`` and ``set_cur_dir()``
	`76`	+/// Test `get_cur_dir()` and `set_cur_dir()`
`77`	`77`	`pub fn test_cur_dir(shell: &ScopedProtocol<Shell>) {`
`78`	`78`	`let mut test_buf = [0u16; 128];`
`79`	`79`
`80`	`80`	`/* Test setting and getting current file system and current directory */`
`81`	`81`	`let mut fs_buf = [0u16; 16];`
`82`		`- let fs_var = CStr16::from_str_with_buf("fs0:",&mut fs_buf).unwrap();`
	`82`	`+ let fs_var = cstr16!("fs0:")`
`83`	`83`	`let mut dir_buf = [0u16; 32];`
`84`	`84`	`let dir_var = CStr16::from_str_with_buf("/", &mut dir_buf).unwrap();`
`85`	`85`	`let status = shell.set_cur_dir(Some(fs_var), Some(dir_var));`

`‎uefi/src/proto/shell/mod.rs`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ use crate::{CStr16, Char16};`
`18`	`18`	`#[unsafe_protocol(ShellProtocol::GUID)]`
`19`	`19`	`pub struct Shell(ShellProtocol);`
`20`	`20`
`21`		`-/// Contains environment variables`
	`21`	`+/// Iterator over the names of environmental variables obtained from the Shell protocol.`
`22`	`22`	`#[derive(Debug)]`
`23`	`23`	`pub struct Vars<'a> {`
`24`	`24`	`/// Char16 containing names of environment variables`
`@@ -29,6 +29,8 @@ pub struct Vars<'a> {`
`29`	`29`
`30`	`30`	`impl<'a> Iterator for Vars<'a> {`
`31`	`31`	`type Item = &'a CStr16;`
	`32`	`+ // We iterate a list of NUL terminated CStr16s.`
	`33`	`+ // The list is terminated with a double NUL.`
`32`	`34`	`fn next(&mut self) -> Option<Self::Item> {`
`33`	`35`	`let cur_start = self.inner;`
`34`	`36`	`let mut cur_len = 0;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 5661358

File tree

2 files changed

2 files changed

`‎uefi-test-runner/src/proto/shell.rs`

`‎uefi/src/proto/shell/mod.rs`

0 commit comments