diff options
| author | 2019-03-12 17:54:20 -0400 | |
|---|---|---|
| committer | 2019-03-12 17:54:20 -0400 | |
| commit | 0f6dd7b64e3dda8fd1d5f75ebac6938a952c0f3f (patch) | |
| tree | ec9d3d731215e2d8e669f62fa568843b1e1f3482 | |
| parent | Merge pull request #2215 from ReinUsesLisp/samplers (diff) | |
| parent | service/service: Remove unncessary calls to c_str() (diff) | |
| download | yuzu-0f6dd7b64e3dda8fd1d5f75ebac6938a952c0f3f.tar.gz yuzu-0f6dd7b64e3dda8fd1d5f75ebac6938a952c0f3f.tar.xz yuzu-0f6dd7b64e3dda8fd1d5f75ebac6938a952c0f3f.zip | |
Merge pull request #2222 from lioncash/cstr
service/service: Remove unncessary calls to c_str()
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/service.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 117f87a45..576fd6407 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -76,7 +76,8 @@ namespace Service { | |||
| 76 | * Creates a function string for logging, complete with the name (or header code, depending | 76 | * Creates a function string for logging, complete with the name (or header code, depending |
| 77 | * on what's passed in) the port name, and all the cmd_buff arguments. | 77 | * on what's passed in) the port name, and all the cmd_buff arguments. |
| 78 | */ | 78 | */ |
| 79 | [[maybe_unused]] static std::string MakeFunctionString(const char* name, const char* port_name, | 79 | [[maybe_unused]] static std::string MakeFunctionString(std::string_view name, |
| 80 | std::string_view port_name, | ||
| 80 | const u32* cmd_buff) { | 81 | const u32* cmd_buff) { |
| 81 | // Number of params == bits 0-5 + bits 6-11 | 82 | // Number of params == bits 0-5 + bits 6-11 |
| 82 | int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F); | 83 | int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F); |
| @@ -158,9 +159,7 @@ void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) { | |||
| 158 | return ReportUnimplementedFunction(ctx, info); | 159 | return ReportUnimplementedFunction(ctx, info); |
| 159 | } | 160 | } |
| 160 | 161 | ||
| 161 | LOG_TRACE( | 162 | LOG_TRACE(Service, "{}", MakeFunctionString(info->name, GetServiceName(), ctx.CommandBuffer())); |
| 162 | Service, "{}", | ||
| 163 | MakeFunctionString(info->name, GetServiceName().c_str(), ctx.CommandBuffer()).c_str()); | ||
| 164 | handler_invoker(this, info->handler_callback, ctx); | 163 | handler_invoker(this, info->handler_callback, ctx); |
| 165 | } | 164 | } |
| 166 | 165 | ||