diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-04-14 18:35:41 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-04-14 18:35:41 +0200 |
| commit | 895554aebccbeeb45e2c469d0bafa1e0d85dd8fb (patch) | |
| tree | 543357ea7b5af9a17ec56ba1e5db2d33f81cc2bf /src/modules | |
| parent | 0a9f710e25f22fa67276aa8d15a008a5341b0f2a (diff) | |
Use std::string internally in UIDGenerator, move UUID_LENGTH into the class as a constant
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_spanningtree/netburst.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp index ee5707fdb..21404e68e 100644 --- a/src/modules/m_spanningtree/netburst.cpp +++ b/src/modules/m_spanningtree/netburst.cpp @@ -102,7 +102,7 @@ void TreeSocket::SendFJoins(Channel* c) for (UserMembCIter i = ulist->begin(); i != ulist->end(); ++i) { const std::string& modestr = i->second->modes; - if ((line.length() + modestr.length() + (UUID_LENGTH-1) + 2) > 480) + if ((line.length() + modestr.length() + UIDGenerator::UUID_LENGTH + 2) > 480) { this->WriteLine(line); line.erase(erase_from); diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index e91214041..1504a8807 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -241,7 +241,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, * crossing the users QUIT further upstream from the server. Thanks jilles! */ - if ((prefix.length() == UUID_LENGTH-1) && (isdigit(prefix[0])) && + if ((prefix.length() == UIDGenerator::UUID_LENGTH) && (isdigit(prefix[0])) && ((command == "FMODE") || (command == "MODE") || (command == "KICK") || (command == "TOPIC") || (command == "KILL") || (command == "ADDLINE") || (command == "DELLINE"))) { /* Special case, we cannot drop these commands as they've been committed already on a |