Unite SSL service providers and SSL profile classes

[user/henk/code/inspircd.git] / src / modules / m_monitor.cpp

diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index 139c70e7646697016ac9faaadc08eda376fd73f5..c69732a7372eb8db002bca300080c4f4cf00779f 100644 (file)
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -245,7 +245,8 @@ class IRCv3::Monitor::Manager
        WatchedList emptywatchedlist;
 };
 
-void IRCv3::Monitor::Manager::ExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+// inline is needed in static builds to support m_watch including the Manager code from this file
+inline void IRCv3::Monitor::Manager::ExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
 {
        if (format == FORMAT_NETWORK)
                return;
@@ -285,7 +286,7 @@ class CommandMonitor : public SplitCommand
                        if (result == IRCv3::Monitor::Manager::WR_TOOMANY)
                        {
                                // List is full, send error which includes the remaining nicks that were not processed
-                               user->WriteNumeric(ERR_MONLISTFULL, "%u %s%s%s :Monitor list is full", maxmonitor, nick.c_str(), (ss.StreamEnd() ? "" : ","), ss.GetRemaining().c_str());
+                               user->WriteNumeric(ERR_MONLISTFULL, maxmonitor, InspIRCd::Format("%s%s%s", nick.c_str(), (ss.StreamEnd() ? "" : ","), ss.GetRemaining().c_str()), "Monitor list is full");
                                break;
                        }
                        else if (result != IRCv3::Monitor::Manager::WR_OK)
@@ -346,7 +347,7 @@ class CommandMonitor : public SplitCommand
                                out.Add(entry->GetNick());
                        }
                        out.Flush();
-                       user->WriteNumeric(RPL_ENDOFMONLIST, ":End of MONITOR list");
+                       user->WriteNumeric(RPL_ENDOFMONLIST, "End of MONITOR list");
                }
                else if (subcmd == 'S')
                {