lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-24 21:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

services/sm: Amend error code constants

Browse source 
Courtesy of @ogniK5377.

This also moves them into the cpp file and limits the visibility to
where they're directly used. It also gets rid of unused or duplicate
error codes.
This commit is contained in:
Lioncash 2018-09-14 01:43:59 -04:00
parent 8e7497d5bb
commit da64da367b
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/hle/service/sm/sm.cpp
View file

@ -15,6 +15,10 @@
namespace Service::SM { namespace Service::SM {
constexpr ResultCode ERR_ALREADY_REGISTERED(ErrorModule::SM, 4);
constexpr ResultCode ERR_INVALID_NAME(ErrorModule::SM, 6);
constexpr ResultCode ERR_SERVICE_NOT_REGISTERED(ErrorModule::SM, 7);
ServiceManager::ServiceManager() = default; ServiceManager::ServiceManager() = default;
ServiceManager::~ServiceManager() = default; ServiceManager::~ServiceManager() = default;
@ -24,10 +28,10 @@ void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) {
static ResultCode ValidateServiceName(const std::string& name) { static ResultCode ValidateServiceName(const std::string& name) {
if (name.size() <= 0 || name.size() > 8) { if (name.size() <= 0 || name.size() > 8) {
return ERR_INVALID_NAME_SIZE; return ERR_INVALID_NAME;
} }
if (name.find('\0') != std::string::npos) { if (name.find('\0') != std::string::npos) {
return ERR_NAME_CONTAINS_NUL; return ERR_INVALID_NAME;
} }
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

6
src/core/hle/service/sm/sm.h
View file

@ -36,12 +36,6 @@ private:
std::shared_ptr<ServiceManager> service_manager; std::shared_ptr<ServiceManager> service_manager;
}; };
constexpr ResultCode ERR_SERVICE_NOT_REGISTERED(-1);
constexpr ResultCode ERR_MAX_CONNECTIONS_REACHED(-1);
constexpr ResultCode ERR_INVALID_NAME_SIZE(-1);
constexpr ResultCode ERR_NAME_CONTAINS_NUL(-1);
constexpr ResultCode ERR_ALREADY_REGISTERED(-1);
class ServiceManager { class ServiceManager {
public: public:
static void InstallInterfaces(std::shared_ptr<ServiceManager> self); static void InstallInterfaces(std::shared_ptr<ServiceManager> self);