TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 07:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error logging

Browse Source 
ok_or will unconditionally creates a LoggedResult, which prints
an error even it successes. Use ok_or_else which lazily creates
a LoggedResult only if it fails.
This commit is contained in:
LoveSy 2023-07-07 01:01:11 +08:00 committed by John Wu
parent 75ba62d588
commit af2207433d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
native/src/boot/cpio.rs
View File

@ -319,7 +319,10 @@ impl Cpio {
} }
fn extract_entry(&self, path: &str, out: &Path) -> LoggedResult<()> { fn extract_entry(&self, path: &str, out: &Path) -> LoggedResult<()> {
let entry = self.entries.get(path).ok_or(log_err!("No such file"))?; let entry = self
.entries
.get(path)
.ok_or_else(|| log_err!("No such file"))?;
eprintln!("Extracting entry [{}] to [{}]", path, out.to_string_lossy()); eprintln!("Extracting entry [{}] to [{}]", path, out.to_string_lossy());
if let Some(parent) = out.parent() { if let Some(parent) = out.parent() {
DirBuilder::new() DirBuilder::new()
@ -449,7 +452,7 @@ impl Cpio {
let entry = self let entry = self
.entries .entries
.remove(&norm_path(from)) .remove(&norm_path(from))
.ok_or(log_err!("no such entry {}", from))?; .ok_or_else(|| log_err!("no such entry {}", from))?;
self.entries.insert(norm_path(to), entry); self.entries.insert(norm_path(to), entry);
eprintln!("Move [{}] -> [{}]", from, to); eprintln!("Move [{}] -> [{}]", from, to);
Ok(()) Ok(())
@ -598,7 +601,7 @@ fn x8u<U: TryFrom<u32>>(x: &[u8; 8]) -> LoggedResult<U> {
let mut ret = 0u32; let mut ret = 0u32;
for i in x { for i in x {
let c = *i as char; let c = *i as char;
let v = c.to_digit(16).ok_or(log_err!("bad cpio header"))?; let v = c.to_digit(16).ok_or_else(|| log_err!("bad cpio header"))?;
ret = ret * 16 + v; ret = ret * 16 + v;
} }
ret.try_into().map_err(|_| log_err!("bad cpio header")) ret.try_into().map_err(|_| log_err!("bad cpio header"))

6
native/src/boot/payload.rs
View File

@ -157,9 +157,11 @@ fn do_extract_boot_from_payload(
for ext in operation.dst_extents.iter() { for ext in operation.dst_extents.iter() {
let out_seek = ext let out_seek = ext
.start_block .start_block
.ok_or(bad_payload!("start block not found"))? .ok_or_else(|| bad_payload!("start block not found"))?
* block_size; * block_size;
let num_blocks = ext.num_blocks.ok_or(bad_payload!("num blocks not found"))?; let num_blocks = ext
.num_blocks
.ok_or_else(|| bad_payload!("num blocks not found"))?;
out_file.seek(SeekFrom::Start(out_seek))?; out_file.seek(SeekFrom::Start(out_seek))?;
out_file.write_zeros(num_blocks as usize)?; out_file.write_zeros(num_blocks as usize)?;
} }