RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:17:35 +00:00
Code Issues Activity Actions

More coding style changes.

Browse source
This commit is contained in:
Andreas Kling 2018-12-03 00:39:25 +01:00
parent d824442e3e
commit f6e27c2abe
39 changed files with 216 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

4
VirtualFileSystem/CharacterDevice.h
View file

@ -12,7 +12,7 @@ public:
RetainPtr<FileDescriptor> open(int options);
virtual bool hasDataAvailableForRead() const = 0;
virtual bool has_data_available_for_reading() const = 0;
virtual ssize_t read(byte* buffer, size_t bufferSize) = 0;
virtual ssize_t write(const byte* buffer, size_t bufferSize) = 0;
@ -20,7 +20,7 @@ public:
unsigned major() const { return m_major; }
unsigned minor() const { return m_minor; }
virtual bool isTTY() const { return false; }
virtual bool is_tty() const { return false; }
virtual int ioctl(Process&, unsigned request, unsigned arg);

32
VirtualFileSystem/FileDescriptor.cpp
View file

@ -48,9 +48,9 @@ RetainPtr<FileDescriptor> FileDescriptor::clone()
}
if (!descriptor)
return nullptr;
descriptor->m_currentOffset = m_currentOffset;
descriptor->m_current_offset = m_current_offset;
#ifdef SERENITY
descriptor->m_isBlocking = m_isBlocking;
descriptor->m_is_blocking = m_is_blocking;
descriptor->m_file_flags = m_file_flags;
#endif
return descriptor;
@ -113,7 +113,7 @@ Unix::off_t FileDescriptor::seek(Unix::off_t offset, int whence)
newOffset = offset;
break;
case SEEK_CUR:
newOffset = m_currentOffset + offset;
newOffset = m_current_offset + offset;
#ifndef SERENITY
if (additionWouldOverflow(m_currentOffset, offset))
return -EOVERFLOW;
@ -129,8 +129,8 @@ Unix::off_t FileDescriptor::seek(Unix::off_t offset, int whence)
return -EINVAL;
}
m_currentOffset = newOffset;
return m_currentOffset;
m_current_offset = newOffset;
return m_current_offset;
}
ssize_t FileDescriptor::read(byte* buffer, size_t count)
@ -143,8 +143,8 @@ ssize_t FileDescriptor::read(byte* buffer, size_t count)
// FIXME: What should happen to m_currentOffset?
return m_vnode->characterDevice()->read(buffer, count);
}
ssize_t nread = m_vnode->fileSystem()->read_inode_bytes(m_vnode->inode, m_currentOffset, count, buffer, this);
m_currentOffset += nread;
ssize_t nread = m_vnode->fileSystem()->read_inode_bytes(m_vnode->inode, m_current_offset, count, buffer, this);
m_current_offset += nread;
return nread;
}
@ -172,18 +172,18 @@ bool FileDescriptor::can_write()
return true;
}
bool FileDescriptor::hasDataAvailableForRead()
bool FileDescriptor::has_data_available_for_reading()
{
if (is_fifo()) {
ASSERT(fifo_direction() == FIFO::Reader);
return m_fifo->can_read();
}
if (m_vnode->isCharacterDevice())
return m_vnode->characterDevice()->hasDataAvailableForRead();
return m_vnode->characterDevice()->has_data_available_for_reading();
return true;
}
ByteBuffer FileDescriptor::readEntireFile()
ByteBuffer FileDescriptor::read_entire_file()
{
ASSERT(!is_fifo());
@ -199,7 +199,7 @@ ByteBuffer FileDescriptor::readEntireFile()
return m_vnode->fileSystem()->read_entire_inode(m_vnode->inode, this);
}
bool FileDescriptor::isDirectory() const
bool FileDescriptor::is_directory() const
{
ASSERT(!is_fifo());
return m_vnode->metadata().isDirectory();
@ -232,12 +232,12 @@ ssize_t FileDescriptor::get_dir_entries(byte* buffer, size_t size)
}
\
#ifdef SERENITY
bool FileDescriptor::isTTY() const
bool FileDescriptor::is_tty() const
{
if (is_fifo())
return false;
if (auto* device = m_vnode->characterDevice())
return device->isTTY();
return device->is_tty();
return false;
}
@ -269,8 +269,8 @@ String FileDescriptor::absolute_path()
{
Stopwatch sw("absolute_path");
#ifdef SERENITY
if (isTTY())
return tty()->ttyName();
if (is_tty())
return tty()->tty_name();
#endif
if (is_fifo()) {
char buf[32];
@ -282,7 +282,7 @@ String FileDescriptor::absolute_path()
}
FileDescriptor::FileDescriptor(FIFO& fifo, FIFO::Direction direction)
: m_isBlocking(true)
: m_is_blocking(true)
, m_fifo(fifo)
, m_fifo_direction(direction)
{

20
VirtualFileSystem/FileDescriptor.h
View file

@ -27,22 +27,22 @@ public:
ssize_t write(const byte* data, size_t);
int stat(Unix::stat*);
bool hasDataAvailableForRead();
bool has_data_available_for_reading();
bool can_write();
ssize_t get_dir_entries(byte* buffer, size_t);
ByteBuffer readEntireFile();
ByteBuffer read_entire_file();
String absolute_path();
bool isDirectory() const;
bool is_directory() const;
bool is_character_device() const { return m_vnode && m_vnode->isCharacterDevice(); }
CharacterDevice* character_device() { return m_vnode ? m_vnode->characterDevice() : nullptr; }
#ifdef SERENITY
bool isTTY() const;
bool is_tty() const;
const TTY* tty() const;
TTY* tty();
#endif
@ -52,8 +52,8 @@ public:
Vnode* vnode() { return m_vnode.ptr(); }
#ifdef SERENITY
bool isBlocking() const { return m_isBlocking; }
void setBlocking(bool b) { m_isBlocking = b; }
bool is_blocking() const { return m_is_blocking; }
void set_blocking(bool b) { m_is_blocking = b; }
dword file_flags() const { return m_file_flags; }
void set_file_flags(dword flags) { m_file_flags = flags; }
@ -62,7 +62,7 @@ public:
FIFO::Direction fifo_direction() { return m_fifo_direction; }
#endif
ByteBuffer& generatorCache() { return m_generatorCache; }
ByteBuffer& generator_cache() { return m_generator_cache; }
private:
friend class VFS;
@ -72,12 +72,12 @@ private:
RetainPtr<Vnode> m_vnode;
RetainPtr<CoreInode> m_inode;
Unix::off_t m_currentOffset { 0 };
Unix::off_t m_current_offset { 0 };
ByteBuffer m_generatorCache;
ByteBuffer m_generator_cache;
#ifdef SERENITY
bool m_isBlocking { true };
bool m_is_blocking { true };
dword m_file_flags { 0 };
RetainPtr<FIFO> m_fifo;

2
VirtualFileSystem/FullDevice.cpp
View file

@ -13,7 +13,7 @@ FullDevice::~FullDevice()
{
}
bool FullDevice::hasDataAvailableForRead() const
bool FullDevice::has_data_available_for_reading() const
{
return true;
}

2
VirtualFileSystem/FullDevice.h
View file

@ -10,6 +10,6 @@ public:
virtual ssize_t read(byte* buffer, size_t bufferSize) override;
virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
virtual bool hasDataAvailableForRead() const override;
virtual bool has_data_available_for_reading() const override;
};

2
VirtualFileSystem/NullDevice.cpp
View file

@ -12,7 +12,7 @@ NullDevice::~NullDevice()
{
}
bool NullDevice::hasDataAvailableForRead() const
bool NullDevice::has_data_available_for_reading() const
{
return true;
}

2
VirtualFileSystem/NullDevice.h
View file

@ -10,6 +10,6 @@ public:
virtual ssize_t read(byte* buffer, size_t bufferSize) override;
virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
virtual bool hasDataAvailableForRead() const override;
virtual bool has_data_available_for_reading() const override;
};

2
VirtualFileSystem/RandomDevice.cpp
View file

@ -29,7 +29,7 @@ static void mysrand(unsigned seed)
}
#endif
bool RandomDevice::hasDataAvailableForRead() const
bool RandomDevice::has_data_available_for_reading() const
{
return true;
}

2
VirtualFileSystem/RandomDevice.h
View file

@ -10,6 +10,6 @@ public:
virtual ssize_t read(byte* buffer, size_t bufferSize) override;
virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
virtual bool hasDataAvailableForRead() const override;
virtual bool has_data_available_for_reading() const override;
};

36
VirtualFileSystem/SyntheticFileSystem.cpp
View file

@ -46,7 +46,7 @@ bool SynthFS::initialize()
RetainPtr<SynthFSInode> SynthFS::create_directory(String&& name)
{
auto file = adopt(*new SynthFSInode(*this, generateInodeIndex()));
auto file = adopt(*new SynthFSInode(*this, generate_inode_index()));
file->m_name = move(name);
file->m_metadata.size = 0;
file->m_metadata.uid = 0;
@ -58,7 +58,7 @@ RetainPtr<SynthFSInode> SynthFS::create_directory(String&& name)
RetainPtr<SynthFSInode> SynthFS::create_text_file(String&& name, ByteBuffer&& contents, Unix::mode_t mode)
{
auto file = adopt(*new SynthFSInode(*this, generateInodeIndex()));
auto file = adopt(*new SynthFSInode(*this, generate_inode_index()));
file->m_data = contents;
file->m_name = move(name);
file->m_metadata.size = file->m_data.size();
@ -71,7 +71,7 @@ RetainPtr<SynthFSInode> SynthFS::create_text_file(String&& name, ByteBuffer&& co
RetainPtr<SynthFSInode> SynthFS::create_generated_file(String&& name, Function<ByteBuffer()>&& generator, Unix::mode_t mode)
{
auto file = adopt(*new SynthFSInode(*this, generateInodeIndex()));
auto file = adopt(*new SynthFSInode(*this, generate_inode_index()));
file->m_generator = move(generator);
file->m_name = move(name);
file->m_metadata.size = 0;
@ -82,7 +82,7 @@ RetainPtr<SynthFSInode> SynthFS::create_generated_file(String&& name, Function<B
return file;
}
InodeIdentifier SynthFS::addFile(RetainPtr<SynthFSInode>&& file, InodeIndex parent)
InodeIdentifier SynthFS::add_file(RetainPtr<SynthFSInode>&& file, InodeIndex parent)
{
ASSERT_INTERRUPTS_DISABLED();
ASSERT(file);
@ -96,7 +96,7 @@ InodeIdentifier SynthFS::addFile(RetainPtr<SynthFSInode>&& file, InodeIndex pare
return new_inode_id;
}
bool SynthFS::removeFile(InodeIndex inode)
bool SynthFS::remove_file(InodeIndex inode)
{
ASSERT_INTERRUPTS_DISABLED();
auto it = m_inodes.find(inode);
@ -117,7 +117,7 @@ bool SynthFS::removeFile(InodeIndex inode)
}
for (auto& child : file.m_children)
removeFile(child->m_metadata.inode.index());
remove_file(child->m_metadata.inode.index());
m_inodes.remove(inode);
return true;
}
@ -193,17 +193,17 @@ ssize_t SynthFS::read_inode_bytes(InodeIdentifier inode, Unix::off_t offset, siz
if (!handle) {
generatedData = file.m_generator();
} else {
if (!handle->generatorCache())
handle->generatorCache() = file.m_generator();
generatedData = handle->generatorCache();
if (!handle->generator_cache())
handle->generator_cache() = file.m_generator();
generatedData = handle->generator_cache();
}
}
auto* data = generatedData ? &generatedData : &file.m_data;
ssize_t nread = min(static_cast<Unix::off_t>(data->size() - offset), static_cast<Unix::off_t>(count));
memcpy(buffer, data->pointer() + offset, nread);
if (nread == 0 && handle && handle->generatorCache())
handle->generatorCache().clear();
if (nread == 0 && handle && handle->generator_cache())
handle->generator_cache().clear();
return nread;
}
@ -213,9 +213,9 @@ InodeIdentifier SynthFS::create_directory(InodeIdentifier, const String&, Unix::
return { };
}
auto SynthFS::generateInodeIndex() -> InodeIndex
auto SynthFS::generate_inode_index() -> InodeIndex
{
return m_nextInodeIndex++;
return m_next_inode_index++;
}
InodeIdentifier SynthFS::find_parent_of_inode(InodeIdentifier inode) const
@ -262,17 +262,17 @@ ssize_t SynthFSInode::read_bytes(Unix::off_t offset, size_t count, byte* buffer,
if (!descriptor) {
generatedData = m_generator();
} else {
if (!descriptor->generatorCache())
descriptor->generatorCache() = m_generator();
generatedData = descriptor->generatorCache();
if (!descriptor->generator_cache())
descriptor->generator_cache() = m_generator();
generatedData = descriptor->generator_cache();
}
}
auto* data = generatedData ? &generatedData : &m_data;
ssize_t nread = min(static_cast<Unix::off_t>(data->size() - offset), static_cast<Unix::off_t>(count));
memcpy(buffer, data->pointer() + offset, nread);
if (nread == 0 && descriptor && descriptor->generatorCache())
descriptor->generatorCache().clear();
if (nread == 0 && descriptor && descriptor->generator_cache())
descriptor->generator_cache().clear();
return nread;
}

8
VirtualFileSystem/SyntheticFileSystem.h
View file

@ -26,7 +26,7 @@ public:
protected:
typedef unsigned InodeIndex;
InodeIndex generateInodeIndex();
InodeIndex generate_inode_index();
static constexpr InodeIndex RootInodeIndex = 1;
SynthFS();
@ -35,11 +35,11 @@ protected:
RetainPtr<SynthFSInode> create_text_file(String&& name, ByteBuffer&&, Unix::mode_t = 0010644);
RetainPtr<SynthFSInode> create_generated_file(String&& name, Function<ByteBuffer()>&&, Unix::mode_t = 0100644);
InodeIdentifier addFile(RetainPtr<SynthFSInode>&&, InodeIndex parent = RootInodeIndex);
bool removeFile(InodeIndex);
InodeIdentifier add_file(RetainPtr<SynthFSInode>&&, InodeIndex parent = RootInodeIndex);
bool remove_file(InodeIndex);
private:
InodeIndex m_nextInodeIndex { 2 };
InodeIndex m_next_inode_index { 2 };
HashMap<InodeIndex, RetainPtr<SynthFSInode>> m_inodes;
};

2
VirtualFileSystem/ZeroDevice.cpp
View file

@ -12,7 +12,7 @@ ZeroDevice::~ZeroDevice()
{
}
bool ZeroDevice::hasDataAvailableForRead() const
bool ZeroDevice::has_data_available_for_reading() const
{
return true;
}

2
VirtualFileSystem/ZeroDevice.h
View file

@ -10,6 +10,6 @@ public:
virtual ssize_t read(byte* buffer, size_t bufferSize) override;
virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
virtual bool hasDataAvailableForRead() const override;
virtual bool has_data_available_for_reading() const override;
};

6
VirtualFileSystem/test.cpp
View file

@ -60,7 +60,7 @@ int main(int c, char** v)
printf("failed to open %s inside fs image\n", v[2]);
return 1;
}
auto contents = descriptor->readEntireFile();
auto contents = descriptor->read_entire_file();
FILE* fout = fopen(v[3], "w");
if (!fout) {
@ -142,7 +142,7 @@ int main(int c, char** v)
}
int error;
auto new_cwd = vfs.open(new_path.string(), error, 0, cwd);
if (new_cwd && new_cwd->isDirectory()) {
if (new_cwd && new_cwd->is_directory()) {
currentDirectory = new_path.string();
cwd = new_cwd->metadata().inode;
} else {
@ -198,7 +198,7 @@ int main(int c, char** v)
printf("failed to open %s\n", pathbuf);
continue;
}
auto contents = descriptor->readEntireFile();
auto contents = descriptor->read_entire_file();
fwrite(contents.pointer(), sizeof(char), contents.size(), stdout);
continue;
}