From 6c20a13d3c6d372cebd4e5d34eb80e02ecd7fcf3 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 19 Dec 2018 12:40:26 +0100 Subject: [PATCH] cleanup - avoid too much indentation --- src/backup/chunk_store.rs | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/backup/chunk_store.rs b/src/backup/chunk_store.rs index 10d85e77..223e0897 100644 --- a/src/backup/chunk_store.rs +++ b/src/backup/chunk_store.rs @@ -182,29 +182,29 @@ impl ChunkStore { let l1_fd = l1_handle.as_raw_fd(); for l1_entry in l1_handle.iter() { - match l1_entry { - Ok(l1_entry) => { - if let Some(file_type) = l1_entry.file_type() { - if file_type == nix::dir::Type::Directory { - let l2name = l1_entry.file_name(); - if l2name.to_bytes_with_nul()[0] == b'.' { continue; } - let mut l2_handle = match Dir::openat( - l1_fd, l2name, OFlag::O_RDONLY, Mode::empty()) { - Ok(h) => h, - Err(err) => bail!( - "unable to open l2 chunk dir {:?}/{:?}/{:?} - {}", - self.chunk_dir, l1name, l2name, err), - }; + let l1_entry = match l1_entry { + Ok(l1_entry) => l1_entry, + Err(_) => continue /* ignore errors? */, + }; + let file_type = match l1_entry.file_type() { + Some(file_type) => file_type, + None => bail!("unsupported file system type on {:?}/{:?}", self.chunk_dir, l1name), + }; + if file_type != nix::dir::Type::Directory { continue; } - self.sweep_old_files(&mut l2_handle); - } - } - } - Err(_) => { /* ignore */ } - } + let l2name = l1_entry.file_name(); + if l2name.to_bytes_with_nul()[0] == b'.' { continue; } + + let mut l2_handle = match Dir::openat( + l1_fd, l2name, OFlag::O_RDONLY, Mode::empty()) { + Ok(h) => h, + Err(err) => bail!( + "unable to open l2 chunk dir {:?}/{:?}/{:?} - {}", + self.chunk_dir, l1name, l2name, err), + }; + self.sweep_old_files(&mut l2_handle); } } - Ok(()) }