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/service/service.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/hle/service/service.h') diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index dcd525727..cb1ecde31 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -39,8 +39,8 @@ class Interface : public Kernel::Object { friend class Manager; public: - const char *GetName() const { return GetPortName(); } - const char *GetTypeName() const { return GetPortName(); } + std::string GetName() const { return GetPortName(); } + std::string GetTypeName() const { return GetPortName(); } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Service; } Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Service; } @@ -57,7 +57,7 @@ public: * Gets the string name used by CTROS for a service * @return Port name of service */ - virtual const char *GetPortName() const { + virtual std::string GetPortName() const { return "[UNKNOWN SERVICE PORT]"; } @@ -86,7 +86,7 @@ public: if (itr == m_functions.end()) { ERROR_LOG(OSHLE, "unknown/unimplemented function: port=%s, command=0x%08X", - GetPortName(), cmd_buff[0]); + GetPortName().c_str(), cmd_buff[0]); // TODO(bunnei): Hack - ignore error u32* cmd_buff = Service::GetCommandBuffer(); @@ -95,7 +95,7 @@ public: } if (itr->second.func == nullptr) { ERROR_LOG(OSHLE, "unimplemented function: port=%s, name=%s", - GetPortName(), itr->second.name.c_str()); + GetPortName().c_str(), itr->second.name.c_str()); // TODO(bunnei): Hack - ignore error u32* cmd_buff = Service::GetCommandBuffer(); -- cgit v1.2.3