summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/sockets/nsd.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-08-10 06:24:31 +0200
committerGitHub <noreply@github.com>2023-08-10 06:24:31 +0200
commit9d3a293a4ea17b60146c10e7561c0fd1219fd6c1 (patch)
treeb69936f3e53ee675de0ca21a1dffabd7e71acae0 /src/core/hle/service/sockets/nsd.cpp
parentMerge pull request #11247 from german77/pctl (diff)
parentfs: return result on null outputs (diff)
downloadyuzu-9d3a293a4ea17b60146c10e7561c0fd1219fd6c1.tar
yuzu-9d3a293a4ea17b60146c10e7561c0fd1219fd6c1.tar.gz
yuzu-9d3a293a4ea17b60146c10e7561c0fd1219fd6c1.tar.bz2
yuzu-9d3a293a4ea17b60146c10e7561c0fd1219fd6c1.tar.lz
yuzu-9d3a293a4ea17b60146c10e7561c0fd1219fd6c1.tar.xz
yuzu-9d3a293a4ea17b60146c10e7561c0fd1219fd6c1.tar.zst
yuzu-9d3a293a4ea17b60146c10e7561c0fd1219fd6c1.zip
Diffstat (limited to 'src/core/hle/service/sockets/nsd.cpp')
-rw-r--r--src/core/hle/service/sockets/nsd.cpp9
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;
}