diff options
-rw-r--r-- | src/index_entry.rs | 22 | ||||
-rw-r--r-- | src/index_record.rs | 6 | ||||
-rw-r--r-- | src/structured_values/index_root.rs | 6 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/index_entry.rs b/src/index_entry.rs index 98c2c7e..c3825b9 100644 --- a/src/index_entry.rs +++ b/src/index_entry.rs @@ -120,7 +120,7 @@ where } #[derive(Clone, Debug)] -pub struct NtfsIndexEntries<'n, K> +pub struct NtfsIndexNodeEntries<'n, K> where K: NewNtfsStructuredValue<'n>, { @@ -130,7 +130,7 @@ where key_type: PhantomData<K>, } -impl<'n, K> NtfsIndexEntries<'n, K> +impl<'n, K> NtfsIndexNodeEntries<'n, K> where K: NewNtfsStructuredValue<'n>, { @@ -146,11 +146,11 @@ where } } - pub fn attach<'a, T>(self, fs: &'a mut T) -> NtfsIndexEntriesAttached<'n, 'a, K, T> + pub fn attach<'a, T>(self, fs: &'a mut T) -> NtfsIndexNodeEntriesAttached<'n, 'a, K, T> where T: Read + Seek, { - NtfsIndexEntriesAttached::new(fs, self) + NtfsIndexNodeEntriesAttached::new(fs, self) } pub fn next<T>(&mut self, fs: &mut T) -> Option<Result<NtfsIndexEntry<'n, K>>> @@ -180,30 +180,30 @@ where } } -pub struct NtfsIndexEntriesAttached<'n, 'a, K, T> +pub struct NtfsIndexNodeEntriesAttached<'n, 'a, K, T> where K: NewNtfsStructuredValue<'n>, T: Read + Seek, { fs: &'a mut T, - index_entries: NtfsIndexEntries<'n, K>, + index_entries: NtfsIndexNodeEntries<'n, K>, } -impl<'n, 'a, K, T> NtfsIndexEntriesAttached<'n, 'a, K, T> +impl<'n, 'a, K, T> NtfsIndexNodeEntriesAttached<'n, 'a, K, T> where K: NewNtfsStructuredValue<'n>, T: Read + Seek, { - fn new(fs: &'a mut T, index_entries: NtfsIndexEntries<'n, K>) -> Self { + fn new(fs: &'a mut T, index_entries: NtfsIndexNodeEntries<'n, K>) -> Self { Self { fs, index_entries } } - pub fn detach(self) -> NtfsIndexEntries<'n, K> { + pub fn detach(self) -> NtfsIndexNodeEntries<'n, K> { self.index_entries } } -impl<'n, 'a, K, T> Iterator for NtfsIndexEntriesAttached<'n, 'a, K, T> +impl<'n, 'a, K, T> Iterator for NtfsIndexNodeEntriesAttached<'n, 'a, K, T> where K: NewNtfsStructuredValue<'n>, T: Read + Seek, @@ -215,7 +215,7 @@ where } } -impl<'n, 'a, K, T> FusedIterator for NtfsIndexEntriesAttached<'n, 'a, K, T> +impl<'n, 'a, K, T> FusedIterator for NtfsIndexNodeEntriesAttached<'n, 'a, K, T> where K: NewNtfsStructuredValue<'n>, T: Read + Seek, diff --git a/src/index_record.rs b/src/index_record.rs index e5906e3..a313982 100644 --- a/src/index_record.rs +++ b/src/index_record.rs @@ -3,7 +3,7 @@ use crate::attribute_value::NtfsAttributeValue; use crate::error::{NtfsError, Result}; -use crate::index_entry::NtfsIndexEntries; +use crate::index_entry::NtfsIndexNodeEntries; use crate::ntfs::Ntfs; use crate::record::RecordHeader; use crate::structured_values::NewNtfsStructuredValue; @@ -69,7 +69,7 @@ impl<'n> NtfsIndexRecord<'n> { Ok(index_record) } - pub fn entries<K, T>(&self, fs: &mut T) -> Result<NtfsIndexEntries<'n, K>> + pub fn entries<K, T>(&self, fs: &mut T) -> Result<NtfsIndexNodeEntries<'n, K>> where K: NewNtfsStructuredValue<'n>, T: Read + Seek, @@ -81,7 +81,7 @@ impl<'n> NtfsIndexRecord<'n> { let mut value = self.value.clone(); value.seek(fs, SeekFrom::Start(start))?; - Ok(NtfsIndexEntries::new(self.ntfs, value, end)) + Ok(NtfsIndexNodeEntries::new(self.ntfs, value, end)) } /// Returns whether this index node has sub-nodes. diff --git a/src/structured_values/index_root.rs b/src/structured_values/index_root.rs index 47b52d6..0a57631 100644 --- a/src/structured_values/index_root.rs +++ b/src/structured_values/index_root.rs @@ -4,7 +4,7 @@ use crate::attribute::NtfsAttributeType; use crate::attribute_value::NtfsAttributeValue; use crate::error::{NtfsError, Result}; -use crate::index_entry::NtfsIndexEntries; +use crate::index_entry::NtfsIndexNodeEntries; use crate::index_record::{IndexNodeHeader, INDEX_NODE_HEADER_SIZE}; use crate::ntfs::Ntfs; use crate::structured_values::NewNtfsStructuredValue; @@ -38,7 +38,7 @@ impl<'n> NtfsIndexRoot<'n> { self.index_node_header.allocated_size } - pub fn entries<K, T>(&self, fs: &mut T) -> Result<NtfsIndexEntries<'n, K>> + pub fn entries<K, T>(&self, fs: &mut T) -> Result<NtfsIndexNodeEntries<'n, K>> where K: NewNtfsStructuredValue<'n>, T: Read + Seek, @@ -50,7 +50,7 @@ impl<'n> NtfsIndexRoot<'n> { let mut value = self.value.clone(); value.seek(fs, SeekFrom::Start(start))?; - Ok(NtfsIndexEntries::new(self.ntfs, value, end)) + Ok(NtfsIndexNodeEntries::new(self.ntfs, value, end)) } pub fn index_record_size(&self) -> u32 { |