Browse Source

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

These were already equivalent, so let's only have one of them.
Andreas Kling 3 years ago
parent
commit
a01b19c878
3 changed files with 2 additions and 7 deletions
  1. 0 5
      Kernel/KBuffer.h
  2. 1 1
      Kernel/Net/IPv4Socket.cpp
  3. 1 1
      Kernel/Syscalls/module.cpp

+ 0 - 5
Kernel/KBuffer.h

@@ -37,11 +37,6 @@ public:
         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 const* data() const { return m_region->vaddr().as_ptr(); }
     [[nodiscard]] size_t size() const { return m_size; }

+ 1 - 1
Kernel/Net/IPv4Socket.cpp

@@ -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);
             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()) {
             dbgln("IPv4Socket: did_receive unable to allocate storage for incoming packet.");
             return false;

+ 1 - 1
Kernel/Syscalls/module.cpp

@@ -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) {
         if (!section.size() || !section_loading_result.is_error())
             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()) {
             section_loading_result = section_storage_or_error.error();
             return;