From 359d6e7b0b0ef7add9eb2015d0dd664a82cf73d7 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 6 Mar 2023 17:16:25 +0100 Subject: Everywhere: Stop using NonnullOwnPtrVector Same as NonnullRefPtrVector: weird semantics, questionable benefits. --- Kernel/Process.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Kernel/Process.h') diff --git a/Kernel/Process.h b/Kernel/Process.h index 57dd5c1afa..77cb2b0f31 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -192,7 +192,7 @@ public: } static LockRefPtr create_kernel_process(LockRefPtr& first_thread, NonnullOwnPtr name, void (*entry)(void*), void* entry_data = nullptr, u32 affinity = THREAD_AFFINITY_DEFAULT, RegisterProcess do_register = RegisterProcess::Yes); - static ErrorOr> try_create_user_process(LockRefPtr& first_thread, StringView path, UserID, GroupID, NonnullOwnPtrVector arguments, NonnullOwnPtrVector environment, TTY*); + static ErrorOr> try_create_user_process(LockRefPtr& first_thread, StringView path, UserID, GroupID, Vector> arguments, Vector> environment, TTY*); static void register_new(Process&); ~Process(); @@ -471,10 +471,10 @@ public: static constexpr size_t max_arguments_size = Thread::default_userspace_stack_size / 8; static constexpr size_t max_environment_size = Thread::default_userspace_stack_size / 8; static constexpr size_t max_auxiliary_size = Thread::default_userspace_stack_size / 8; - NonnullOwnPtrVector const& arguments() const { return m_arguments; }; - NonnullOwnPtrVector const& environment() const { return m_environment; }; + Vector> const& arguments() const { return m_arguments; }; + Vector> const& environment() const { return m_environment; }; - ErrorOr exec(NonnullOwnPtr path, NonnullOwnPtrVector arguments, NonnullOwnPtrVector environment, Thread*& new_main_thread, InterruptsState& previous_interrupts_state, int recursion_depth = 0); + ErrorOr exec(NonnullOwnPtr path, Vector> arguments, Vector> environment, Thread*& new_main_thread, InterruptsState& previous_interrupts_state, int recursion_depth = 0); ErrorOr load(NonnullLockRefPtr main_program_description, LockRefPtr interpreter_description, const ElfW(Ehdr) & main_program_header); @@ -606,7 +606,7 @@ private: bool create_perf_events_buffer_if_needed(); void delete_perf_events_buffer(); - ErrorOr do_exec(NonnullLockRefPtr main_program_description, NonnullOwnPtrVector arguments, NonnullOwnPtrVector environment, LockRefPtr interpreter_description, Thread*& new_main_thread, InterruptsState& previous_interrupts_state, const ElfW(Ehdr) & main_program_header); + ErrorOr do_exec(NonnullLockRefPtr main_program_description, Vector> arguments, Vector> environment, LockRefPtr interpreter_description, Thread*& new_main_thread, InterruptsState& previous_interrupts_state, const ElfW(Ehdr) & main_program_header); ErrorOr do_write(OpenFileDescription&, UserOrKernelBuffer const&, size_t, Optional = {}); ErrorOr do_statvfs(FileSystem const& path, Custody const*, statvfs* buf); @@ -846,8 +846,8 @@ private: SpinlockProtected, LockRank::None> m_current_directory; - NonnullOwnPtrVector m_arguments; - NonnullOwnPtrVector m_environment; + Vector> m_arguments; + Vector> m_environment; LockRefPtr m_tty; -- cgit v1.2.3