CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #93 from lioncash/ref 

core: Pass string by reference in FetchFromPortName and DeleteService
master
bunnei 2014-09-06 14:06:37 +07:00
parent 272a201d12 d30747efea
commit a130086587
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/service/service.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ void Manager::AddService(Interface* service) {
} }
/// Removes a service from the manager, also frees memory /// Removes a service from the manager, also frees memory
void Manager::DeleteService(std::string port_name) { void Manager::DeleteService(const std::string& port_name) {
Interface* service = FetchFromPortName(port_name); Interface* service = FetchFromPortName(port_name);
m_services.erase(std::remove(m_services.begin(), m_services.end(), service), m_services.end()); m_services.erase(std::remove(m_services.begin(), m_services.end(), service), m_services.end());
m_port_map.erase(port_name); m_port_map.erase(port_name);
@ -54,7 +54,7 @@ Interface* Manager::FetchFromHandle(Handle handle) {
} }
/// Get a Service Interface from its port /// Get a Service Interface from its port
Interface* Manager::FetchFromPortName(std::string port_name) { Interface* Manager::FetchFromPortName(const std::string& port_name) {
auto itr = m_port_map.find(port_name); auto itr = m_port_map.find(port_name);
if (itr == m_port_map.end()) { if (itr == m_port_map.end()) {
return nullptr; return nullptr;

4
src/core/hle/service/service.h
Unescape Escape View File

@ -149,13 +149,13 @@ public:
void AddService(Interface* service); void AddService(Interface* service);
/// Removes a service from the manager (does not delete it though) /// Removes a service from the manager (does not delete it though)
void DeleteService(std::string port_name); void DeleteService(const std::string& port_name);
/// Get a Service Interface from its UID /// Get a Service Interface from its UID
Interface* FetchFromHandle(u32 uid); Interface* FetchFromHandle(u32 uid);
/// Get a Service Interface from its port /// Get a Service Interface from its port
Interface* FetchFromPortName(std::string port_name); Interface* FetchFromPortName(const std::string& port_name);
private: private: