mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-19 18:13:21 +02:00
service/service: Remove unncessary calls to c_str()
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:
parent
b7518fc26c
commit
aba5dae557
@ -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
|
* 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);
|
||||||
@ -179,7 +180,7 @@ void ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& context)
|
|||||||
}
|
}
|
||||||
|
|
||||||
LOG_TRACE(Service, "{}",
|
LOG_TRACE(Service, "{}",
|
||||||
MakeFunctionString(info->name, GetServiceName().c_str(), context.CommandBuffer()));
|
MakeFunctionString(info->name, GetServiceName(), context.CommandBuffer()));
|
||||||
handler_invoker(this, info->handler_callback, context);
|
handler_invoker(this, info->handler_callback, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user