summaryrefslogtreecommitdiff
path: root/src/core/hle/svc.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2014-08-17 23:03:22 -0400
committerGravatar Lioncash2014-08-17 23:12:20 -0400
commit98fa3f7cba22997aef8ec4d121584c2488389c38 (patch)
tree40585fc835fa8fc27882923a4439d88e7ae171de /src/core/hle/svc.cpp
parentMerge pull request #52 from lioncash/memory (diff)
downloadyuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.gz
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.xz
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.zip
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.
Diffstat (limited to 'src/core/hle/svc.cpp')
-rw-r--r--src/core/hle/svc.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 8720bed31..28f2844eb 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -92,7 +92,7 @@ Result SendSyncRequest(Handle handle) {
92 Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle); 92 Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle);
93 93
94 _assert_msg_(KERNEL, (object != nullptr), "called, but kernel object is nullptr!"); 94 _assert_msg_(KERNEL, (object != nullptr), "called, but kernel object is nullptr!");
95 DEBUG_LOG(SVC, "called handle=0x%08X(%s)", handle, object->GetTypeName()); 95 DEBUG_LOG(SVC, "called handle=0x%08X(%s)", handle, object->GetTypeName().c_str());
96 96
97 bool wait = false; 97 bool wait = false;
98 Result res = object->SyncRequest(&wait); 98 Result res = object->SyncRequest(&wait);
@@ -118,8 +118,8 @@ Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
118 118
119 Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle); 119 Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle);
120 120
121 DEBUG_LOG(SVC, "called handle=0x%08X(%s:%s), nanoseconds=%d", handle, object->GetTypeName(), 121 DEBUG_LOG(SVC, "called handle=0x%08X(%s:%s), nanoseconds=%d", handle, object->GetTypeName().c_str(),
122 object->GetName(), nano_seconds); 122 object->GetName().c_str(), nano_seconds);
123 123
124 _assert_msg_(KERNEL, (object != nullptr), "called, but kernel object is nullptr!"); 124 _assert_msg_(KERNEL, (object != nullptr), "called, but kernel object is nullptr!");
125 125
@@ -152,8 +152,8 @@ Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, bool wa
152 _assert_msg_(KERNEL, (object != nullptr), "called handle=0x%08X, but kernel object " 152 _assert_msg_(KERNEL, (object != nullptr), "called handle=0x%08X, but kernel object "
153 "is nullptr!", handles[i]); 153 "is nullptr!", handles[i]);
154 154
155 DEBUG_LOG(SVC, "\thandle[%d] = 0x%08X(%s:%s)", i, handles[i], object->GetTypeName(), 155 DEBUG_LOG(SVC, "\thandle[%d] = 0x%08X(%s:%s)", i, handles[i], object->GetTypeName().c_str(),
156 object->GetName()); 156 object->GetName().c_str());
157 157
158 Result res = object->WaitSynchronization(&wait); 158 Result res = object->WaitSynchronization(&wait);
159 159