Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests 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
parent 0aa824b12f
commit 8603f0f9b1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/hle/service/service.cpp
View file

@ -76,7 +76,8 @@ namespace Service {
* Creates a function string for logging, complete with the name (or header code, depending * 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. * 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) { const u32* cmd_buff) {
// Number of params == bits 0-5 + bits 6-11 // Number of params == bits 0-5 + bits 6-11
int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F); int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F);
@ -158,9 +159,7 @@ void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) {
return ReportUnimplementedFunction(ctx, info); return ReportUnimplementedFunction(ctx, info);
} }
LOG_TRACE( LOG_TRACE(Service, "{}", MakeFunctionString(info->name, GetServiceName(), ctx.CommandBuffer()));
Service, "{}",
MakeFunctionString(info->name, GetServiceName().c_str(), ctx.CommandBuffer()).c_str());
handler_invoker(this, info->handler_callback, ctx); handler_invoker(this, info->handler_callback, ctx);
} }