Refactor Channel::UserList() to use std::string

[user/henk/code/inspircd.git] / src / userprocess.cpp

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 382f4ffa0bf2cf6ce5d92e2d1bf6eb045a459e45..40fd35c5901e6fc8f25fd2af0a229cd52b945740 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -66,8 +66,7 @@ void InspIRCd::DoBackgroundUserStuff()
                                        if (!curr->lastping)
                                        {
                                                time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime());
-                                               char message[MAXBUF];
-                                               snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
+                                               const std::string message = "Ping timeout: " + ConvToStr(time) + (time == 1 ? " seconds" : " second");
                                                curr->lastping = 1;
                                                curr->nping = Time() + curr->MyClass->GetPingTime();
                                                this->Users->QuitUser(curr, message);
@@ -80,7 +79,7 @@ void InspIRCd::DoBackgroundUserStuff()
                                }
                                break;
                        case REG_NICKUSER:
-                               if (AllModulesReportReady(curr) && curr->dns_done)
+                               if (AllModulesReportReady(curr))
                                {
                                        /* User has sent NICK/USER, modules are okay, DNS finished. */
                                        curr->FullConnect();