From 98fa3f7cba22997aef8ec4d121584c2488389c38 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 17 Aug 2014 23:03:22 -0400 Subject: Core: Alter the kernel string functions to use std::string instead of const char*. Most functions already operate on std::strings. This also removes the need to manually null terminate thread names. --- src/core/hle/kernel/archive.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/hle/kernel/archive.cpp') diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp index 76b2520da..5079fcb84 100644 --- a/src/core/hle/kernel/archive.cpp +++ b/src/core/hle/kernel/archive.cpp @@ -31,8 +31,8 @@ enum class FileCommand : u32 { class Archive : public Object { public: - const char* GetTypeName() const { return "Archive"; } - const char* GetName() const { return name.c_str(); } + std::string GetTypeName() const { return "Archive"; } + std::string GetName() const { return name; } static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; } Kernel::HandleType GetHandleType() const { return HandleType::Archive; } @@ -110,7 +110,7 @@ Result MountArchive(Archive* archive) { return -1; } g_archive_map[id_code] = archive->GetHandle(); - INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName()); + INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName().c_str()); return 0; } -- cgit v1.2.3