diff options
author | bunnei <bunneidev@gmail.com> | 2014-08-19 03:42:44 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-08-19 03:42:44 +0200 |
commit | e9c5c563a500ac19ecb2f580ce065a9010dedac9 (patch) | |
tree | 25155672077a81a5f1b66e738826a7b850c55e82 /src/core/hle/kernel/thread.cpp | |
parent | Merge pull request #45 from bunnei/master (diff) | |
parent | Core: Alter the kernel string functions to use std::string instead of const char*. (diff) | |
download | yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.gz yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.bz2 yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.lz yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.xz yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.zst yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.zip |
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 1d7ded6f6..554ec9756 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -2,13 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include <stdio.h> - -#include <list> #include <algorithm> -#include <vector> +#include <cstdio> +#include <list> #include <map> #include <string> +#include <vector> #include "common/common.h" #include "common/thread_queue_list.h" @@ -25,8 +24,8 @@ namespace Kernel { class Thread : public Kernel::Object { public: - const char* GetName() const { return name; } - const char* GetTypeName() const { return "Thread"; } + std::string GetName() const { return name; } + std::string GetTypeName() const { return "Thread"; } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; } Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Thread; } @@ -71,7 +70,7 @@ public: std::vector<Handle> waiting_threads; - char name[Kernel::MAX_NAME_LENGTH + 1]; + std::string name; }; // Lists all thread ids that aren't deleted/etc. @@ -336,9 +335,7 @@ Thread* CreateThread(Handle& handle, const char* name, u32 entry_point, s32 prio thread->processor_id = processor_id; thread->wait_type = WAITTYPE_NONE; thread->wait_handle = 0; - - strncpy(thread->name, name, Kernel::MAX_NAME_LENGTH); - thread->name[Kernel::MAX_NAME_LENGTH] = '\0'; + thread->name = name; return thread; } |