summaryrefslogtreecommitdiff
path: root/src/core/hle/service/ns
diff options
context:
space:
mode:
authorGravatar Liam2023-03-06 19:04:12 -0500
committerGravatar Liam2023-03-06 20:58:42 -0500
commit1d0fe75e7cca27d79006654dcc56c44cb4096d3a (patch)
tree3291e0ad973cd3c0e07ded22c968f40c2c6dd955 /src/core/hle/service/ns
parentMerge pull request #9890 from Kelebek1/reverb_fix (diff)
downloadyuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.tar.gz
yuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.tar.xz
yuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.zip
hle: rename legacy errors to Results
Diffstat (limited to 'src/core/hle/service/ns')
-rw-r--r--src/core/hle/service/ns/errors.h5
-rw-r--r--src/core/hle/service/ns/ns.cpp8
2 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/service/ns/errors.h b/src/core/hle/service/ns/errors.h
index 8a7621798..16d2ea6f7 100644
--- a/src/core/hle/service/ns/errors.h
+++ b/src/core/hle/service/ns/errors.h
@@ -7,5 +7,6 @@
7 7
8namespace Service::NS { 8namespace Service::NS {
9 9
10constexpr Result ERR_APPLICATION_LANGUAGE_NOT_FOUND{ErrorModule::NS, 300}; 10constexpr Result ResultApplicationLanguageNotFound{ErrorModule::NS, 300};
11} \ No newline at end of file 11
12}
diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp
index d6f0faea2..376067a95 100644
--- a/src/core/hle/service/ns/ns.cpp
+++ b/src/core/hle/service/ns/ns.cpp
@@ -416,14 +416,14 @@ ResultVal<u8> IApplicationManagerInterface::GetApplicationDesiredLanguage(
416 if (application_language == std::nullopt) { 416 if (application_language == std::nullopt) {
417 LOG_ERROR(Service_NS, "Could not convert application language! language_code={}", 417 LOG_ERROR(Service_NS, "Could not convert application language! language_code={}",
418 language_code); 418 language_code);
419 return ERR_APPLICATION_LANGUAGE_NOT_FOUND; 419 return Service::NS::ResultApplicationLanguageNotFound;
420 } 420 }
421 const auto priority_list = GetApplicationLanguagePriorityList(*application_language); 421 const auto priority_list = GetApplicationLanguagePriorityList(*application_language);
422 if (!priority_list) { 422 if (!priority_list) {
423 LOG_ERROR(Service_NS, 423 LOG_ERROR(Service_NS,
424 "Could not find application language priorities! application_language={}", 424 "Could not find application language priorities! application_language={}",
425 *application_language); 425 *application_language);
426 return ERR_APPLICATION_LANGUAGE_NOT_FOUND; 426 return Service::NS::ResultApplicationLanguageNotFound;
427 } 427 }
428 428
429 // Try to find a valid language. 429 // Try to find a valid language.
@@ -436,7 +436,7 @@ ResultVal<u8> IApplicationManagerInterface::GetApplicationDesiredLanguage(
436 436
437 LOG_ERROR(Service_NS, "Could not find a valid language! supported_languages={:08X}", 437 LOG_ERROR(Service_NS, "Could not find a valid language! supported_languages={:08X}",
438 supported_languages); 438 supported_languages);
439 return ERR_APPLICATION_LANGUAGE_NOT_FOUND; 439 return Service::NS::ResultApplicationLanguageNotFound;
440} 440}
441 441
442void IApplicationManagerInterface::ConvertApplicationLanguageToLanguageCode( 442void IApplicationManagerInterface::ConvertApplicationLanguageToLanguageCode(
@@ -461,7 +461,7 @@ ResultVal<u64> IApplicationManagerInterface::ConvertApplicationLanguageToLanguag
461 ConvertToLanguageCode(static_cast<ApplicationLanguage>(application_language)); 461 ConvertToLanguageCode(static_cast<ApplicationLanguage>(application_language));
462 if (language_code == std::nullopt) { 462 if (language_code == std::nullopt) {
463 LOG_ERROR(Service_NS, "Language not found! application_language={}", application_language); 463 LOG_ERROR(Service_NS, "Language not found! application_language={}", application_language);
464 return ERR_APPLICATION_LANGUAGE_NOT_FOUND; 464 return Service::NS::ResultApplicationLanguageNotFound;
465 } 465 }
466 466
467 return static_cast<u64>(*language_code); 467 return static_cast<u64>(*language_code);