diff options
author | Liam <byteslice@airmail.cc> | 2023-07-17 00:55:27 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-08-08 17:09:37 +0200 |
commit | 83eee1d2266a1de374be0a8b2c0f2827f5e25bcf (patch) | |
tree | 7dfbdfb32b6671a79f433c3cb59acc7ba0e5cc9c /src/core/hle/service/sockets | |
parent | core: remove ResultVal type (diff) | |
download | yuzu-83eee1d2266a1de374be0a8b2c0f2827f5e25bcf.tar yuzu-83eee1d2266a1de374be0a8b2c0f2827f5e25bcf.tar.gz yuzu-83eee1d2266a1de374be0a8b2c0f2827f5e25bcf.tar.bz2 yuzu-83eee1d2266a1de374be0a8b2c0f2827f5e25bcf.tar.lz yuzu-83eee1d2266a1de374be0a8b2c0f2827f5e25bcf.tar.xz yuzu-83eee1d2266a1de374be0a8b2c0f2827f5e25bcf.tar.zst yuzu-83eee1d2266a1de374be0a8b2c0f2827f5e25bcf.zip |
Diffstat (limited to 'src/core/hle/service/sockets')
-rw-r--r-- | src/core/hle/service/sockets/nsd.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/hle/service/sockets/nsd.cpp b/src/core/hle/service/sockets/nsd.cpp index 5dfcaabb1..bac21752a 100644 --- a/src/core/hle/service/sockets/nsd.cpp +++ b/src/core/hle/service/sockets/nsd.cpp @@ -54,7 +54,7 @@ NSD::NSD(Core::System& system_, const char* name) : ServiceFramework{system_, na RegisterHandlers(functions); } -static ResultVal<std::string> ResolveImpl(const std::string& fqdn_in) { +static std::string ResolveImpl(const std::string& fqdn_in) { // The real implementation makes various substitutions. // For now we just return the string as-is, which is good enough when not // connecting to real Nintendo servers. @@ -64,13 +64,10 @@ static ResultVal<std::string> ResolveImpl(const std::string& fqdn_in) { static Result ResolveCommon(const std::string& fqdn_in, std::array<char, 0x100>& fqdn_out) { const auto res = ResolveImpl(fqdn_in); - if (res.Failed()) { - return res.Code(); - } - if (res->size() >= fqdn_out.size()) { + if (res.size() >= fqdn_out.size()) { return ResultOverflow; } - std::memcpy(fqdn_out.data(), res->c_str(), res->size() + 1); + std::memcpy(fqdn_out.data(), res.c_str(), res.size() + 1); return ResultSuccess; } |