M-Labs/rust-fatfs
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small code improvements.

Browse Source
This commit is contained in:
Rafał Harabień 2017-10-21 15:51:19 +02:00
parent df98ca8779
commit 2a61b0d175
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/dir.rs
View File

@ -21,10 +21,10 @@ pub(crate) enum DirRawStream<'a, 'b: 'a> {
} }
impl <'a, 'b> DirRawStream<'a, 'b> { impl <'a, 'b> DirRawStream<'a, 'b> {
pub(crate) fn global_pos(&self) -> Option<u64> { pub(crate) fn abs_pos(&self) -> Option<u64> {
match self { match self {
&DirRawStream::File(ref file) => file.global_pos(), &DirRawStream::File(ref file) => file.abs_pos(),
&DirRawStream::Root(ref slice) => Some(slice.global_pos()), &DirRawStream::Root(ref slice) => Some(slice.abs_pos()),
} }
} }
} }
@ -78,7 +78,7 @@ bitflags! {
const LFN_PART_LEN: usize = 13; const LFN_PART_LEN: usize = 13;
const DIR_ENTRY_SIZE: u64 = 32; const DIR_ENTRY_SIZE: u64 = 32;
const DIR_ENTRY_REMOVED_FLAG: u8 = 0xE5; const DIR_ENTRY_FREE_FLAG: u8 = 0xE5;
const LFN_ENTRY_LAST_FLAG: u8 = 0x40; const LFN_ENTRY_LAST_FLAG: u8 = 0x40;
#[allow(dead_code)] #[allow(dead_code)]
@ -151,8 +151,8 @@ impl DirFileEntryData {
Ok(()) Ok(())
} }
fn is_removed(&self) -> bool { fn is_free(&self) -> bool {
self.name[0] == DIR_ENTRY_REMOVED_FLAG self.name[0] == DIR_ENTRY_FREE_FLAG
} }
fn is_end(&self) -> bool { fn is_end(&self) -> bool {
@ -192,8 +192,8 @@ impl DirLfnEntryData {
Ok(()) Ok(())
} }
fn is_removed(&self) -> bool { fn is_free(&self) -> bool {
self.order == DIR_ENTRY_REMOVED_FLAG self.order == DIR_ENTRY_FREE_FLAG
} }
fn is_end(&self) -> bool { fn is_end(&self) -> bool {
@ -219,7 +219,7 @@ impl DirEntryData {
let mut name = [0; 11]; let mut name = [0; 11];
rdr.read_exact(&mut name)?; rdr.read_exact(&mut name)?;
let attrs = FileAttributes::from_bits_truncate(rdr.read_u8()?); let attrs = FileAttributes::from_bits_truncate(rdr.read_u8()?);
if attrs == FileAttributes::LFN { if attrs & FileAttributes::LFN == FileAttributes::LFN {
let mut data = DirLfnEntryData { let mut data = DirLfnEntryData {
attrs, ..Default::default() attrs, ..Default::default()
}; };
@ -251,10 +251,10 @@ impl DirEntryData {
} }
} }
fn is_removed(&self) -> bool { fn is_free(&self) -> bool {
match self { match self {
&DirEntryData::File(ref file) => file.is_removed(), &DirEntryData::File(ref file) => file.is_free(),
&DirEntryData::Lfn(ref lfn) => lfn.is_removed(), &DirEntryData::Lfn(ref lfn) => lfn.is_free(),
} }
} }
@ -440,19 +440,19 @@ impl <'a, 'b> fmt::Debug for DirEntry<'a, 'b> {
#[derive(Clone)] #[derive(Clone)]
pub struct Dir<'a, 'b: 'a> { pub struct Dir<'a, 'b: 'a> {
rdr: DirRawStream<'a, 'b>, stream: DirRawStream<'a, 'b>,
fs: FileSystemRef<'a, 'b>, fs: FileSystemRef<'a, 'b>,
} }
impl <'a, 'b> Dir<'a, 'b> { impl <'a, 'b> Dir<'a, 'b> {
pub(crate) fn new(rdr: DirRawStream<'a, 'b>, fs: FileSystemRef<'a, 'b>) -> Dir<'a, 'b> { pub(crate) fn new(stream: DirRawStream<'a, 'b>, fs: FileSystemRef<'a, 'b>) -> Dir<'a, 'b> {
Dir { rdr, fs } Dir { stream, fs }
} }
pub fn iter(&self) -> DirIter<'a, 'b> { pub fn iter(&self) -> DirIter<'a, 'b> {
DirIter { DirIter {
rdr: self.rdr.clone(), stream: self.stream.clone(),
fs: self.fs.clone(), fs: self.fs.clone(),
err: false, err: false,
} }
@ -532,7 +532,7 @@ impl <'a, 'b> Dir<'a, 'b> {
Some(n) => self.fs.cluster_iter(n).free()?, Some(n) => self.fs.cluster_iter(n).free()?,
_ => {}, _ => {},
} }
let mut stream = self.rdr.clone(); let mut stream = self.stream.clone();
stream.seek(SeekFrom::Start(e.offset_range.0 as u64))?; stream.seek(SeekFrom::Start(e.offset_range.0 as u64))?;
let num = (e.offset_range.1 - e.offset_range.0) as usize / DIR_ENTRY_SIZE as usize; let num = (e.offset_range.1 - e.offset_range.0) as usize / DIR_ENTRY_SIZE as usize;
for _ in 0..num { for _ in 0..num {
@ -540,8 +540,8 @@ impl <'a, 'b> Dir<'a, 'b> {
trace!("removing dir entry {:?}", data); trace!("removing dir entry {:?}", data);
match data { match data {
DirEntryData::File(ref mut data) => DirEntryData::File(ref mut data) =>
data.name[0] = DIR_ENTRY_REMOVED_FLAG, data.name[0] = DIR_ENTRY_FREE_FLAG,
DirEntryData::Lfn(ref mut data) => data.order = DIR_ENTRY_REMOVED_FLAG, DirEntryData::Lfn(ref mut data) => data.order = DIR_ENTRY_FREE_FLAG,
}; };
stream.seek(SeekFrom::Current(-(DIR_ENTRY_SIZE as i64)))?; stream.seek(SeekFrom::Current(-(DIR_ENTRY_SIZE as i64)))?;
data.serialize(&mut stream)?; data.serialize(&mut stream)?;
@ -552,13 +552,13 @@ impl <'a, 'b> Dir<'a, 'b> {
} }
fn find_free_entries(&mut self, num_entries: usize) -> io::Result<DirRawStream<'a, 'b>> { fn find_free_entries(&mut self, num_entries: usize) -> io::Result<DirRawStream<'a, 'b>> {
let mut stream = self.rdr.clone(); let mut stream = self.stream.clone();
let mut first_free = 0; let mut first_free = 0;
let mut num_free = 0; let mut num_free = 0;
let mut i = 0; let mut i = 0;
loop { loop {
let data = DirEntryData::deserialize(&mut stream)?; let data = DirEntryData::deserialize(&mut stream)?;
if data.is_removed() { if data.is_free() {
if num_free == 0 { if num_free == 0 {
first_free = i; first_free = i;
} }
@ -572,7 +572,7 @@ impl <'a, 'b> Dir<'a, 'b> {
first_free = i; first_free = i;
} }
stream.seek(io::SeekFrom::Start(first_free as u64 * DIR_ENTRY_SIZE))?; stream.seek(io::SeekFrom::Start(first_free as u64 * DIR_ENTRY_SIZE))?;
// FIXME: make sure there is END? // FIXME: make sure new allocated cluster is zeroed
return Ok(stream); return Ok(stream);
} else { } else {
num_free = 0; num_free = 0;
@ -646,7 +646,7 @@ impl <'a, 'b> Dir<'a, 'b> {
}; };
raw_entry.serialize(&mut stream)?; raw_entry.serialize(&mut stream)?;
let end_pos = stream.seek(io::SeekFrom::Current(0))?; let end_pos = stream.seek(io::SeekFrom::Current(0))?;
let abs_pos = stream.global_pos().map(|p| p - DIR_ENTRY_SIZE); let abs_pos = stream.abs_pos().map(|p| p - DIR_ENTRY_SIZE);
return Ok(DirEntry { return Ok(DirEntry {
data: raw_entry, data: raw_entry,
lfn: Vec::new(), lfn: Vec::new(),
@ -659,19 +659,19 @@ impl <'a, 'b> Dir<'a, 'b> {
#[derive(Clone)] #[derive(Clone)]
pub struct DirIter<'a, 'b: 'a> { pub struct DirIter<'a, 'b: 'a> {
rdr: DirRawStream<'a, 'b>, stream: DirRawStream<'a, 'b>,
fs: FileSystemRef<'a, 'b>, fs: FileSystemRef<'a, 'b>,
err: bool, err: bool,
} }
impl <'a, 'b> DirIter<'a, 'b> { impl <'a, 'b> DirIter<'a, 'b> {
fn read_dir_entry_raw_data(&mut self) -> io::Result<DirEntryData> { fn read_dir_entry_raw_data(&mut self) -> io::Result<DirEntryData> {
DirEntryData::deserialize(&mut self.rdr) DirEntryData::deserialize(&mut self.stream)
} }
fn read_dir_entry(&mut self) -> io::Result<Option<DirEntry<'a, 'b>>> { fn read_dir_entry(&mut self) -> io::Result<Option<DirEntry<'a, 'b>>> {
let mut lfn_buf = LongNameBuilder::new(); let mut lfn_buf = LongNameBuilder::new();
let mut offset = self.rdr.seek(SeekFrom::Current(0))?; let mut offset = self.stream.seek(SeekFrom::Current(0))?;
let mut begin_offset = offset; let mut begin_offset = offset;
loop { loop {
let raw_entry = self.read_dir_entry_raw_data()?; let raw_entry = self.read_dir_entry_raw_data()?;
@ -683,13 +683,13 @@ impl <'a, 'b> DirIter<'a, 'b> {
return Ok(None); return Ok(None);
} }
// Check if this is deleted or volume ID entry // Check if this is deleted or volume ID entry
if data.is_removed() || data.attrs.contains(FileAttributes::VOLUME_ID) { if data.is_free() || data.attrs.contains(FileAttributes::VOLUME_ID) {
lfn_buf.clear(); lfn_buf.clear();
begin_offset = offset; begin_offset = offset;
continue; continue;
} }
// Get entry position on volume // Get entry position on volume
let entry_pos = self.rdr.global_pos().map(|p| p - DIR_ENTRY_SIZE); let entry_pos = self.stream.abs_pos().map(|p| p - DIR_ENTRY_SIZE);
// Check if LFN checksum is valid // Check if LFN checksum is valid
lfn_buf.validate_chksum(&data.name); lfn_buf.validate_chksum(&data.name);
return Ok(Some(DirEntry { return Ok(Some(DirEntry {
@ -702,7 +702,7 @@ impl <'a, 'b> DirIter<'a, 'b> {
}, },
DirEntryData::Lfn(data) => { DirEntryData::Lfn(data) => {
// Check if this is deleted entry // Check if this is deleted entry
if data.is_removed() { if data.is_free() {
lfn_buf.clear(); lfn_buf.clear();
begin_offset = offset; begin_offset = offset;
continue; continue;

2
src/file.rs
View File

@ -74,7 +74,7 @@ impl <'a, 'b> File<'a, 'b> {
} }
} }
pub(crate) fn global_pos(&self) -> Option<u64> { pub(crate) fn abs_pos(&self) -> Option<u64> {
// Returns current position relative to filesystem start // Returns current position relative to filesystem start
// Note: when between clusters it returns position after previous cluster // Note: when between clusters it returns position after previous cluster
match self.current_cluster { match self.current_cluster {

2
src/fs.rs
View File

@ -275,7 +275,7 @@ impl <'a, 'b> DiskSlice<'a, 'b> {
Self::new(first_sector as u64 * bytes_per_sector, sector_count as u64 * bytes_per_sector, mirrors, fs) Self::new(first_sector as u64 * bytes_per_sector, sector_count as u64 * bytes_per_sector, mirrors, fs)
} }
pub(crate) fn global_pos(&self) -> u64 { pub(crate) fn abs_pos(&self) -> u64 {
self.begin + self.offset self.begin + self.offset
} }
} }