diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/configparser.cpp | 5 | ||||
| -rw-r--r-- | src/configreader.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/opertype.cpp | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/configparser.cpp b/src/configparser.cpp index 86268a132..2af796b21 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -507,6 +507,11 @@ ConfigTag::ConfigTag(const std::string& Tag, const std::string& file, int line) { } +OperInfo::OperInfo(const std::string& Name) + : name(Name) +{ +} + std::string OperInfo::getConfig(const std::string& key) { std::string rv; diff --git a/src/configreader.cpp b/src/configreader.cpp index 6471413e0..2a50a22b3 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -158,9 +158,8 @@ void ServerConfig::CrossCheckOperClassType() if (OperTypes.find(name) != OperTypes.end()) throw CoreException("Duplicate type block with name " + name + " at " + tag->getTagLocation()); - OperInfo* ifo = new OperInfo; + OperInfo* ifo = new OperInfo(name); OperTypes[name] = ifo; - ifo->name = name; ifo->type_block = tag; std::string classname; @@ -190,8 +189,7 @@ void ServerConfig::CrossCheckOperClassType() if (oper_blocks.find(name) != oper_blocks.end()) throw CoreException("Duplicate oper block with name " + name + " at " + tag->getTagLocation()); - OperInfo* ifo = new OperInfo; - ifo->name = type; + OperInfo* ifo = new OperInfo(type); ifo->oper_block = tag; ifo->type_block = tblk->second->type_block; ifo->class_blocks.assign(tblk->second->class_blocks.begin(), tblk->second->class_blocks.end()); diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp index ab531c171..b1d0c327e 100644 --- a/src/modules/m_spanningtree/opertype.cpp +++ b/src/modules/m_spanningtree/opertype.cpp @@ -39,10 +39,7 @@ CmdResult CommandOpertype::HandleRemote(RemoteUser* u, std::vector<std::string>& if (iter != ServerInstance->Config->OperTypes.end()) u->oper = iter->second; else - { - u->oper = new OperInfo; - u->oper->name = opertype; - } + u->oper = new OperInfo(opertype); if (Utils->quiet_bursts) { |