From ffab6897aa1bc668f98130b4bb485a4602509938 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 31 Jan 2019 17:31:23 +0100 Subject: Big, possibly complete sweep of naming changes. --- Kernel/SyntheticFileSystem.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Kernel/SyntheticFileSystem.cpp') 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(*this)); + generated_data = m_generator(const_cast(*this)); } else { if (!descriptor->generator_cache()) descriptor->generator_cache() = m_generator(const_cast(*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(data->size() - offset), static_cast(count)); memcpy(buffer, data->pointer() + offset, nread); if (nread == 0 && descriptor && descriptor->generator_cache()) @@ -228,14 +228,14 @@ bool SynthFSInode::traverse_as_directory(Functionm_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; } -- cgit v1.2.3