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

AK: Improve smart pointer ergonomics a bit.

Browse source
This commit is contained in:
Andreas Kling 2019-04-14 02:36:06 +02:00
parent d5dec1922b
commit 3f6408919f
17 changed files with 49 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -336,7 +336,7 @@ KResult VFS::rename(const String& old_path, const String& new_path, Inode& base)
if (!new_inode_or_error.is_error()) {
auto new_inode = new_inode_or_error.value();
// FIXME: Is this really correct? Check what other systems do.
if (new_inode.ptr() == old_inode.ptr())
if (new_inode == old_inode)
return KSuccess;
if (new_inode->is_directory() && !old_inode->is_directory())
return KResult(-EISDIR);

2
Kernel/Process.cpp
View file

@ -121,7 +121,7 @@ bool Process::deallocate_region(Region& region)
{
InterruptDisabler disabler;
for (int i = 0; i < m_regions.size(); ++i) {
if (m_regions[i].ptr() == &region) {
if (m_regions[i] == &region) {
MM.unmap_region(region);
m_regions.remove(i);
return true;

4
Kernel/VM/MemoryManager.cpp
View file

@ -142,7 +142,7 @@ auto MemoryManager::ensure_pte(PageDirectory& page_directory, LinearAddress ladd
dbgprintf("MM: PDE %u not present (requested for L%x), allocating\n", page_directory_index, laddr.get());
#endif
if (page_directory_index == 0) {
ASSERT(&page_directory == m_kernel_page_directory.ptr());
ASSERT(&page_directory == m_kernel_page_directory);
pde.set_page_table_base((dword)m_page_table_zero);
pde.set_user_allowed(false);
pde.set_present(true);
@ -153,7 +153,7 @@ auto MemoryManager::ensure_pte(PageDirectory& page_directory, LinearAddress ladd
#ifdef MM_DEBUG
dbgprintf("MM: PD K%x (%s) at P%x allocated page table #%u (for L%x) at P%x\n",
&page_directory,
&page_directory == m_kernel_page_directory.ptr() ? "Kernel" : "User",
&page_directory == m_kernel_page_directory ? "Kernel" : "User",
page_directory.cr3(),
page_directory_index,
laddr.get(),

2
Kernel/VM/Region.h
View file

@ -68,7 +68,7 @@ public:
void set_page_directory(PageDirectory& page_directory)
{
ASSERT(!m_page_directory || m_page_directory.ptr() == &page_directory);
ASSERT(!m_page_directory || m_page_directory == &page_directory);
m_page_directory = page_directory;
}