emu-mirror/citra-canary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

service/service: Remove unncessary calls to c_str()

Browse Source 
These can just be passed regularly, now that we use fmt instead of our
old logging system.

While we're at it, make the parameters to MakeFunctionString
std::string_views.
This commit is contained in:
Lioncash 2019-03-10 18:00:54 -04:00 committed by fearlessTobi
parent b7518fc26c
commit aba5dae557
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/hle/service/service.cpp
View File

@ -112,7 +112,8 @@ const std::array<ServiceModuleInfo, 40> service_module_map{
* Creates a function string for logging, complete with the name (or header code, depending
* on what's passed in) the port name, and all the cmd_buff arguments.
*/
[[maybe_unused]] static std::string MakeFunctionString(const char* name, const char* port_name,
[[maybe_unused]] static std::string MakeFunctionString(std::string_view name,
std::string_view port_name,
const u32* cmd_buff) {
// Number of params == bits 0-5 + bits 6-11
int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F);
@ -179,7 +180,7 @@ void ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& context)
}
LOG_TRACE(Service, "{}",
MakeFunctionString(info->name, GetServiceName().c_str(), context.CommandBuffer()));
MakeFunctionString(info->name, GetServiceName(), context.CommandBuffer()));
handler_invoker(this, info->handler_callback, context);
}