From 98fa3f7cba22997aef8ec4d121584c2488389c38 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
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/apt.h     |  2 +-
 src/core/hle/service/fs.h      |  2 +-
 src/core/hle/service/gsp.h     |  2 +-
 src/core/hle/service/hid.h     |  2 +-
 src/core/hle/service/ndm.h     |  2 +-
 src/core/hle/service/service.h | 10 +++++-----
 src/core/hle/service/srv.h     |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/core/hle/service')

diff --git a/src/core/hle/service/apt.h b/src/core/hle/service/apt.h
index dca3097e..4c7dd07e 100644
--- a/src/core/hle/service/apt.h
+++ b/src/core/hle/service/apt.h
@@ -29,7 +29,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    const char *GetPortName() const {
+    std::string GetPortName() const {
         return "APT:U";
     }
 };
diff --git a/src/core/hle/service/fs.h b/src/core/hle/service/fs.h
index fabf5ac7..36f3697d 100644
--- a/src/core/hle/service/fs.h
+++ b/src/core/hle/service/fs.h
@@ -23,7 +23,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    const char *GetPortName() const {
+    std::string GetPortName() const {
         return "fs:USER";
     }
 };
diff --git a/src/core/hle/service/gsp.h b/src/core/hle/service/gsp.h
index fccebef7..b25dbb7b 100644
--- a/src/core/hle/service/gsp.h
+++ b/src/core/hle/service/gsp.h
@@ -137,7 +137,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    const char *GetPortName() const {
+    std::string GetPortName() const {
         return "gsp::Gpu";
     }
 
diff --git a/src/core/hle/service/hid.h b/src/core/hle/service/hid.h
index 81c29eb2..b17fcfa8 100644
--- a/src/core/hle/service/hid.h
+++ b/src/core/hle/service/hid.h
@@ -25,7 +25,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    const char *GetPortName() const {
+    std::string GetPortName() const {
         return "hid:USER";
     }
 
diff --git a/src/core/hle/service/ndm.h b/src/core/hle/service/ndm.h
index fbe88fb8..d5ec28f5 100644
--- a/src/core/hle/service/ndm.h
+++ b/src/core/hle/service/ndm.h
@@ -24,7 +24,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    const char *GetPortName() const {
+    std::string GetPortName() const {
         return "ndm:u";
     }
 
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index dcd52572..cb1ecde3 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();
diff --git a/src/core/hle/service/srv.h b/src/core/hle/service/srv.h
index 81109a2a..9451472d 100644
--- a/src/core/hle/service/srv.h
+++ b/src/core/hle/service/srv.h
@@ -22,7 +22,7 @@ public:
      * Gets the string name used by CTROS for the service
      * @return Port name of service
      */
-    const char *GetPortName() const {
+    std::string GetPortName() const {
         return "srv:";
     }
 
-- 
cgit v1.2.3