summaryrefslogtreecommitdiff
path: root/Kernel/SyntheticFileSystem.cpp
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-01-31 17:31:23 +0100
committerAndreas Kling <awesomekling@gmail.com>2019-01-31 17:31:23 +0100
commitffab6897aa1bc668f98130b4bb485a4602509938 (patch)
treea4d1933fc390ea0803bb3826353262fbf06b885f /Kernel/SyntheticFileSystem.cpp
parent27fa09aee492e6c8da9168d24f0b1d2c5d2162d5 (diff)
downloadserenity-ffab6897aa1bc668f98130b4bb485a4602509938.zip
Big, possibly complete sweep of naming changes.
Diffstat (limited to 'Kernel/SyntheticFileSystem.cpp')
-rw-r--r--Kernel/SyntheticFileSystem.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Kernel/SyntheticFileSystem.cpp b/Kernel/SyntheticFileSystem.cpp
index 56117d9843..6cdc3036ce 100644
--- a/Kernel/SyntheticFileSystem.cpp
+++ b/Kernel/SyntheticFileSystem.cpp
@@ -202,18 +202,18 @@ ssize_t SynthFSInode::read_bytes(off_t offset, size_t count, byte* buffer, FileD
ASSERT(offset >= 0);
ASSERT(buffer);
- ByteBuffer generatedData;
+ ByteBuffer generated_data;
if (m_generator) {
if (!descriptor) {
- generatedData = m_generator(const_cast<SynthFSInode&>(*this));
+ generated_data = m_generator(const_cast<SynthFSInode&>(*this));
} else {
if (!descriptor->generator_cache())
descriptor->generator_cache() = m_generator(const_cast<SynthFSInode&>(*this));
- generatedData = descriptor->generator_cache();
+ generated_data = descriptor->generator_cache();
}
}
- auto* data = generatedData ? &generatedData : &m_data;
+ auto* data = generated_data ? &generated_data : &m_data;
ssize_t nread = min(static_cast<off_t>(data->size() - offset), static_cast<off_t>(count));
memcpy(buffer, data->pointer() + offset, nread);
if (nread == 0 && descriptor && descriptor->generator_cache())
@@ -228,14 +228,14 @@ bool SynthFSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntry&
kprintf("SynthFS: traverse_as_directory %u\n", index());
#endif
- if (!m_metadata.isDirectory())
+ if (!m_metadata.is_directory())
return false;
callback({ ".", 1, m_metadata.inode, 2 });
callback({ "..", 2, m_parent, 2 });
for (auto& child : m_children)
- callback({ child->m_name.characters(), child->m_name.length(), child->m_metadata.inode, child->m_metadata.isDirectory() ? (byte)2 : (byte)1 });
+ callback({ child->m_name.characters(), child->m_name.length(), child->m_metadata.inode, child->m_metadata.is_directory() ? (byte)2 : (byte)1 });
return true;
}