RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:28:11 +00:00
Code Issues Activity Actions

Yet another pass of style fixes.

Browse source
This commit is contained in:
Andreas Kling 2018-12-21 02:10:45 +01:00
parent 89040cdc99
commit ec1c487dcd
43 changed files with 183 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

4
VirtualFileSystem/DiskBackedFileSystem.cpp
View file

@ -55,7 +55,7 @@ ByteBuffer DiskBackedFS::readBlock(unsigned index) const
}
#endif
auto buffer = ByteBuffer::createUninitialized(blockSize());
auto buffer = ByteBuffer::create_uninitialized(blockSize());
//kprintf("created block buffer with size %u\n", blockSize());
DiskOffset baseOffset = static_cast<DiskOffset>(index) * static_cast<DiskOffset>(blockSize());
auto* bufferPointer = buffer.pointer();
@ -81,7 +81,7 @@ ByteBuffer DiskBackedFS::readBlocks(unsigned index, unsigned count) const
return nullptr;
if (count == 1)
return readBlock(index);
auto blocks = ByteBuffer::createUninitialized(count * blockSize());
auto blocks = ByteBuffer::create_uninitialized(count * blockSize());
byte* out = blocks.pointer();
for (unsigned i = 0; i < count; ++i) {

28
VirtualFileSystem/Ext2FileSystem.cpp
View file

@ -27,9 +27,9 @@ Ext2FS::~Ext2FS()
ByteBuffer Ext2FS::read_super_block() const
{
auto buffer = ByteBuffer::createUninitialized(1024);
auto buffer = ByteBuffer::create_uninitialized(1024);
device().read_block(2, buffer.pointer());
device().read_block(3, buffer.offsetPointer(512));
device().read_block(3, buffer.offset_pointer(512));
return buffer;
}
@ -172,7 +172,7 @@ OwnPtr<ext2_inode> Ext2FS::lookup_ext2_inode(unsigned inode) const
return { };
auto* e2inode = reinterpret_cast<ext2_inode*>(kmalloc(inode_size()));
memcpy(e2inode, reinterpret_cast<ext2_inode*>(block.offsetPointer(offset)), inode_size());
memcpy(e2inode, reinterpret_cast<ext2_inode*>(block.offset_pointer(offset)), inode_size());
#ifdef EXT2_DEBUG
dumpExt2Inode(*e2inode);
#endif
@ -357,14 +357,14 @@ ssize_t Ext2FSInode::read_bytes(Unix::off_t offset, size_t count, byte* buffer,
return nread;
}
if (m_block_list.isEmpty()) {
if (m_block_list.is_empty()) {
auto block_list = fs().block_list_for_inode(m_raw_inode);
LOCKER(m_lock);
if (m_block_list.size() != block_list.size())
m_block_list = move(block_list);
}
if (m_block_list.isEmpty()) {
if (m_block_list.is_empty()) {
kprintf("ext2fs: read_bytes: empty block list for inode %u\n", index());
return -EIO;
}
@ -436,7 +436,7 @@ ssize_t Ext2FS::read_inode_bytes(InodeIdentifier inode, Unix::off_t offset, size
// FIXME: It's grossly inefficient to fetch the blocklist on every call to readInodeBytes().
// It needs to be cached!
auto list = block_list_for_inode(*e2inode);
if (list.isEmpty()) {
if (list.is_empty()) {
kprintf("ext2fs: readInodeBytes: empty block list for inode %u\n", inode.index());
return -EIO;
}
@ -500,7 +500,7 @@ bool Ext2FS::write_inode(InodeIdentifier inode, const ByteBuffer& data)
ASSERT(blocksNeededBefore == blocksNeededAfter);
auto list = block_list_for_inode(*e2inode);
if (list.isEmpty()) {
if (list.is_empty()) {
kprintf("ext2fs: writeInode: empty block list for inode %u\n", inode.index());
return false;
}
@ -527,7 +527,7 @@ bool Ext2FSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntry&)
ASSERT(buffer);
auto* entry = reinterpret_cast<ext2_dir_entry_2*>(buffer.pointer());
while (entry < buffer.endPointer()) {
while (entry < buffer.end_pointer()) {
if (entry->inode != 0) {
#ifdef EXT2_DEBUG
kprintf("Ext2Inode::traverse_as_directory: %u, name_len: %u, rec_len: %u, file_type: %u, name: %s\n", entry->inode, entry->name_len, entry->rec_len, entry->file_type, namebuf);
@ -586,7 +586,7 @@ bool Ext2FS::write_directory_inode(unsigned directoryInode, Vector<DirectoryEntr
dbgprintf("Ext2FS: directory size: %u (occupied: %u)\n", directorySize, occupiedSize);
auto directoryData = ByteBuffer::createUninitialized(occupiedSize);
auto directoryData = ByteBuffer::create_uninitialized(occupiedSize);
BufferStream stream(directoryData);
for (unsigned i = 0; i < entries.size(); ++i) {
@ -752,7 +752,7 @@ bool Ext2FS::write_ext2_inode(unsigned inode, const ext2_inode& e2inode)
cached_inode.m_lookup_cache.clear();
}
}
memcpy(reinterpret_cast<ext2_inode*>(block.offsetPointer(offset)), &e2inode, inode_size());
memcpy(reinterpret_cast<ext2_inode*>(block.offset_pointer(offset)), &e2inode, inode_size());
writeBlock(blockIndex, block);
return true;
}
@ -1000,7 +1000,7 @@ InodeIdentifier Ext2FS::create_inode(InodeIdentifier parentInode, const String&
}
auto blocks = allocate_blocks(group_index_from_inode(inode), ceilDiv(size, blockSize()));
if (blocks.isEmpty()) {
if (blocks.is_empty()) {
kprintf("Ext2FS: createInode: allocateBlocks failed\n");
error = -ENOSPC;
return { };
@ -1091,7 +1091,7 @@ InodeIdentifier Ext2FS::find_parent_of_inode(InodeIdentifier inode_id) const
InodeIdentifier foundParent;
for (auto& directory : directories_in_group) {
if (!directory->reverse_lookup(inode->identifier()).isNull()) {
if (!directory->reverse_lookup(inode->identifier()).is_null()) {
foundParent = directory->identifier();
break;
}
@ -1104,7 +1104,7 @@ void Ext2FSInode::populate_lookup_cache()
{
{
LOCKER(m_lock);
if (!m_lookup_cache.isEmpty())
if (!m_lookup_cache.is_empty())
return;
}
HashMap<String, unsigned> children;
@ -1115,7 +1115,7 @@ void Ext2FSInode::populate_lookup_cache()
});
LOCKER(m_lock);
if (!m_lookup_cache.isEmpty())
if (!m_lookup_cache.is_empty())
return;
m_lookup_cache = move(children);
}

4
VirtualFileSystem/FileDescriptor.cpp
View file

@ -188,7 +188,7 @@ ByteBuffer FileDescriptor::read_entire_file()
ASSERT(!is_fifo());
if (m_vnode->isCharacterDevice()) {
auto buffer = ByteBuffer::createUninitialized(1024);
auto buffer = ByteBuffer::create_uninitialized(1024);
ssize_t nread = m_vnode->characterDevice()->read(buffer.pointer(), buffer.size());
buffer.trim(nread);
return buffer;
@ -214,7 +214,7 @@ ssize_t FileDescriptor::get_dir_entries(byte* buffer, size_t size)
return -ENOTDIR;
// FIXME: Compute the actual size needed.
auto tempBuffer = ByteBuffer::createUninitialized(2048);
auto tempBuffer = ByteBuffer::create_uninitialized(2048);
BufferStream stream(tempBuffer);
m_vnode->vfs()->traverse_directory_inode(*m_vnode->core_inode(), [&stream] (auto& entry) {
stream << (dword)entry.inode.index();

6
VirtualFileSystem/FileSystem.cpp
View file

@ -21,7 +21,7 @@ static HashTable<Inode*>& all_inodes()
return *s_inode_set;
}
void FS::initializeGlobals()
void FS::initialize_globals()
{
s_lastFileSystemID = 0;
s_fs_map = nullptr;
@ -52,7 +52,7 @@ ByteBuffer Inode::read_entire(FileDescriptor* descriptor)
return fs().read_entire_inode(identifier(), descriptor);
/*
size_t initial_size = metadata().size ? metadata().size : 4096;
auto contents = ByteBuffer::createUninitialized(initial_size);
auto contents = ByteBuffer::create_uninitialized(initial_size);
ssize_t nread;
byte buffer[4096];
@ -90,7 +90,7 @@ ByteBuffer FS::read_entire_inode(InodeIdentifier inode, FileDescriptor* handle)
}
size_t initialSize = metadata.size ? metadata.size : 4096;
auto contents = ByteBuffer::createUninitialized(initialSize);
auto contents = ByteBuffer::create_uninitialized(initialSize);
ssize_t nread;
byte buffer[4096];

2
VirtualFileSystem/FileSystem.h
View file

@ -21,7 +21,7 @@ class FileDescriptor;
class FS : public Retainable<FS> {
public:
static void initializeGlobals();
static void initialize_globals();
virtual ~FS();
dword id() const { return m_fsid; }

10
VirtualFileSystem/VirtualFileSystem.cpp
View file

@ -22,7 +22,7 @@ VFS& VFS::the()
void VFS::initialize_globals()
{
s_the = nullptr;
FS::initializeGlobals();
FS::initialize_globals();
}
VFS::VFS()
@ -177,7 +177,7 @@ bool VFS::mount_root(RetainPtr<FS>&& fileSystem)
auto VFS::allocateNode() -> RetainPtr<Vnode>
{
if (m_vnode_freelist.isEmpty()) {
if (m_vnode_freelist.is_empty()) {
kprintf("VFS: allocateNode has no nodes left\n");
return nullptr;
}
@ -351,7 +351,7 @@ String VFS::absolute_path(Inode& core_inode)
ASSERT(parent_id.is_valid());
inode = get_inode(parent_id);
}
if (lineage.isEmpty())
if (lineage.is_empty())
return "/";
lineage.append(m_root_vnode->inode);
StringBuilder builder;
@ -369,7 +369,7 @@ String VFS::absolute_path(Inode& core_inode)
InodeIdentifier VFS::resolve_path(const String& path, InodeIdentifier base, int& error, int options, InodeIdentifier* deepest_dir)
{
if (path.isEmpty()) {
if (path.is_empty()) {
error = -EINVAL;
return { };
}
@ -388,7 +388,7 @@ InodeIdentifier VFS::resolve_path(const String& path, InodeIdentifier base, int&
for (unsigned i = 0; i < parts.size(); ++i) {
bool inode_was_root_at_head_of_loop = crumb_id.is_root_inode();
auto& part = parts[i];
if (part.isEmpty())
if (part.is_empty())
break;
auto metadata = crumb_id.metadata();
if (!metadata.isValid()) {

2
VirtualFileSystem/test.cpp
View file

@ -109,7 +109,7 @@ int main(int c, char** v)
String command = cmdbuf;
auto parts = command.split(' ');
if (parts.isEmpty())
if (parts.is_empty())
continue;
String cmd = parts[0];