diff options
| author |  Sadie Powell | 2024-11-01 14:35:23 +0000 |
|---|---|---|
| committer | Sadie Powell | 2024-11-01 15:53:04 +0000 |
| commit | 8a3aba4044ee10df332631c4c66ed60299566e58 (patch) | |
| tree | afb185a313dff83d61c26e3b95f47b62d3ab5694 /modules/spanningtree/capab.cpp | |
| parent | Default <options:extbanformat> to name. (diff) | |
| parent | Use fmtlib instead of iostream in ConvToStr where available. (diff) | |
Merge branch 'insp4' into master.
Diffstat (limited to 'modules/spanningtree/capab.cpp')
| -rw-r--r-- | modules/spanningtree/capab.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/spanningtree/capab.cpp b/modules/spanningtree/capab.cpp index c5ca10042..ad9fd76c5 100644 --- a/modules/spanningtree/capab.cpp +++ b/modules/spanningtree/capab.cpp @@ -284,8 +284,8 @@ bool TreeSocket::BuildExtBanList(std::string& out) if (!extbanmgr) return false; - const ExtBan::Manager::LetterMap& extbans = extbanmgr->GetLetterMap(); - for (ExtBan::Manager::LetterMap::const_iterator iter = extbans.begin(); iter != extbans.end(); ++iter) + const auto& extbans = extbanmgr->GetNameMap(); + for (auto iter = extbans.begin(); iter != extbans.end(); ++iter) { if (iter != extbans.begin()) out.push_back(' '); @@ -301,9 +301,9 @@ bool TreeSocket::BuildExtBanList(std::string& out) break; } - out.append(extban->GetName()) - .append("=") - .push_back(extban->GetLetter()); + out.append(extban->GetName()); + if (extban->GetLetter()) + out.append("=").push_back(extban->GetLetter()); } return true; } |