RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-25 12:45:06 +00:00
Code Issues Activity Actions

Kernel: Remove KBuffer::try_copy() in favor of try_create_with_bytes()

Browse source 
These were already equivalent, so let's only have one of them.
This commit is contained in:
Andreas Kling 2021-09-07 16:22:29 +02:00
parent 8ded4ad88c
commit a01b19c878
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/KBuffer.h
View file

@ -37,11 +37,6 @@ public:
return buffer; return buffer;
} }
static KResultOr<NonnullOwnPtr<KBuffer>> try_copy(const void* data, size_t size, Memory::Region::Access access = Memory::Region::Access::ReadWrite, StringView name = "KBuffer")
{
return try_create_with_bytes(ReadonlyBytes { data, size }, access, name);
}
[[nodiscard]] u8* data() { return m_region->vaddr().as_ptr(); } [[nodiscard]] u8* data() { return m_region->vaddr().as_ptr(); }
[[nodiscard]] u8 const* data() const { return m_region->vaddr().as_ptr(); } [[nodiscard]] u8 const* data() const { return m_region->vaddr().as_ptr(); }
[[nodiscard]] size_t size() const { return m_size; } [[nodiscard]] size_t size() const { return m_size; }

2
Kernel/Net/IPv4Socket.cpp
View file

@ -426,7 +426,7 @@ bool IPv4Socket::did_receive(const IPv4Address& source_address, u16 source_port,
dbgln("IPv4Socket({}): did_receive refusing packet since queue is full.", this); dbgln("IPv4Socket({}): did_receive refusing packet since queue is full.", this);
return false; return false;
} }
auto data_or_error = KBuffer::try_copy(packet.data(), packet.size()); auto data_or_error = KBuffer::try_create_with_bytes(packet);
if (data_or_error.is_error()) { if (data_or_error.is_error()) {
dbgln("IPv4Socket: did_receive unable to allocate storage for incoming packet."); dbgln("IPv4Socket: did_receive unable to allocate storage for incoming packet.");
return false; return false;

2
Kernel/Syscalls/module.cpp
View file

@ -45,7 +45,7 @@ KResultOr<FlatPtr> Process::sys$module_load(Userspace<const char*> user_path, si
elf_image->for_each_section_of_type(SHT_PROGBITS, [&](const ELF::Image::Section& section) { elf_image->for_each_section_of_type(SHT_PROGBITS, [&](const ELF::Image::Section& section) {
if (!section.size() || !section_loading_result.is_error()) if (!section.size() || !section_loading_result.is_error())
return; return;
auto section_storage_or_error = KBuffer::try_copy(section.raw_data(), section.size(), Memory::Region::Access::ReadWriteExecute); auto section_storage_or_error = KBuffer::try_create_with_bytes(ReadonlyBytes { section.raw_data(), section.size() }, Memory::Region::Access::ReadWriteExecute);
if (section_storage_or_error.is_error()) { if (section_storage_or_error.is_error()) {
section_loading_result = section_storage_or_error.error(); section_loading_result = section_storage_or_error.error();
return; return;