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

Fix build

Browse Source
This commit is contained in:
Rafał Harabień 2018-08-05 17:21:08 +02:00
parent dce8b32577
commit 8c9d476c2f
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/dir.rs
View File

@ -409,22 +409,11 @@ impl<'a, T: ReadWriteSeek + 'a> Dir<'a, T> {
() ()
} }
fn create_lfn_entries_generator(name: &str, short_name: &[u8]) -> io::Result<(LfnEntriesGenerator, LfnUtf16)> { fn alloc_and_write_lfn_entries(&self, lfn_utf16: &LfnUtf16, short_name: &[u8]) -> io::Result<(DirRawStream<'a, T>, u64)> {
// check if name doesn't contain unsupported characters
validate_long_name(name)?;
// convert long name to UTF-16
let lfn_utf16 = Self::encode_lfn_utf16(name);
// get short name checksum // get short name checksum
let lfn_chsum = lfn_checksum(&short_name); let lfn_chsum = lfn_checksum(short_name);
// create LFN entries generator // create LFN entries generator
let lfn_iter = LfnEntriesGenerator::new(&lfn_utf16, lfn_chsum); let lfn_iter = LfnEntriesGenerator::new(&lfn_utf16, lfn_chsum);
Ok((lfn_iter, lfn_utf16))
}
fn write_entry(&self, name: &str, raw_entry: DirFileEntryData) -> io::Result<DirEntry<'a, T>> {
trace!("write_entry {}", name);
// create LFN entries generator
let (lfn_iter, lfn_utf16) = Self::create_lfn_entries_generator(name, raw_entry.name())?;
// find space for new entries (multiple LFN entries and 1 SFN entry) // find space for new entries (multiple LFN entries and 1 SFN entry)
let num_entries = lfn_iter.len() + 1; let num_entries = lfn_iter.len() + 1;
let mut stream = self.find_free_entries(num_entries)?; let mut stream = self.find_free_entries(num_entries)?;
@ -433,6 +422,16 @@ impl<'a, T: ReadWriteSeek + 'a> Dir<'a, T> {
for lfn_entry in lfn_iter { for lfn_entry in lfn_iter {
lfn_entry.serialize(&mut stream)?; lfn_entry.serialize(&mut stream)?;
} }
Ok((stream, start_pos))
}
fn write_entry(&self, name: &str, raw_entry: DirFileEntryData) -> io::Result<DirEntry<'a, T>> {
trace!("write_entry {}", name);
// check if name doesn't contain unsupported characters
validate_long_name(name)?;
// convert long name to UTF-16
let lfn_utf16 = Self::encode_lfn_utf16(name);
let (mut stream, start_pos) = self.alloc_and_write_lfn_entries(&lfn_utf16, raw_entry.name())?;
// write short name entry // write short name entry
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))?;