diff options
Diffstat (limited to 'src')
36 files changed, 49 insertions, 49 deletions
diff --git a/src/cidr.cpp b/src/cidr.cpp index 31546dae2..f45c63b98 100644 --- a/src/cidr.cpp +++ b/src/cidr.cpp @@ -37,7 +37,7 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr /* The caller is trying to match ident@<mask>/bits. * Chop off the ident@ portion, use match() on it - * seperately. + * separately. */ if (match_with_username) { diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 717431087..d3befc6c0 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -231,7 +231,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman // Iterator to the first excess parameter const CommandBase::Params::iterator firstexcess = lastkeep + 1; - // Append all excess parameter(s) to the last parameter, seperated by spaces + // Append all excess parameter(s) to the last parameter, separated by spaces for (CommandBase::Params::const_iterator i = firstexcess; i != command_p.end(); ++i) { lastkeep->push_back(' '); @@ -243,7 +243,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman } /* - * We call OnPreCommand here seperately if the command exists, so the magic above can + * We call OnPreCommand here separately if the command exists, so the magic above can * truncate to max_params if necessary. -- w00t */ ModResult MOD_RESULT; diff --git a/src/coremods/core_channel/cmode_k.cpp b/src/coremods/core_channel/cmode_k.cpp index 5563c0072..ea4b5241d 100644 --- a/src/coremods/core_channel/cmode_k.cpp +++ b/src/coremods/core_channel/cmode_k.cpp @@ -45,7 +45,7 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s return MODEACTION_DENY; if (exists && (parameter != *key)) { - /* Key is currently set and the correct key wasnt given */ + /* Key is currently set and the correct key wasn't given */ return MODEACTION_DENY; } } else { diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp index 6b356d011..13d6be558 100644 --- a/src/coremods/core_oper/cmd_kill.cpp +++ b/src/coremods/core_oper/cmd_kill.cpp @@ -57,7 +57,7 @@ class KillMessage : public ClientProtocol::Message */ CmdResult CommandKill::Handle(User* user, const Params& parameters) { - /* Allow comma seperated lists of users for /KILL (thanks w00t) */ + /* Allow comma separated lists of users for /KILL (thanks w00t) */ if (CommandParser::LoopCall(user, this, parameters, 0)) { // If we got a colon delimited list of nicks then the handler ran for each nick, diff --git a/src/coremods/core_serialize_rfc.cpp b/src/coremods/core_serialize_rfc.cpp index 8604eaf9f..dcd67d49e 100644 --- a/src/coremods/core_serialize_rfc.cpp +++ b/src/coremods/core_serialize_rfc.cpp @@ -89,7 +89,7 @@ bool RFCSerializer::Parse(LocalUser* user, const std::string& line, ClientProtoc while (ss.GetToken(token)) { // Two or more tags with the same key must not be sent, but if a client violates that we accept - // the first occurence of duplicate tags and ignore all later occurences. + // the first occurrence of duplicate tags and ignore all later occurrences. // // Another option is to reject the message entirely but there is no standard way of doing that. const std::string::size_type p = token.find('='); diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index 8ac86337e..541fb0bd6 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -312,8 +312,8 @@ CmdResult CommandWhois::HandleLocal(LocalUser* user, const Params& parameters) return CMD_SUCCESS; /* - * If 2 paramters are specified (/whois nick nick), ignore the first one like spanningtree - * does, and use the second one, otherwise, use the only paramter. -- djGrrr + * If 2 parameters are specified (/whois nick nick), ignore the first one like spanningtree + * does, and use the second one, otherwise, use the only parameter. -- djGrrr */ if (parameters.size() > 1) userindex = 1; diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index e019a660b..b1692e6d1 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -383,7 +383,7 @@ bool InspIRCd::Duration(const std::string& str, unsigned long& duration) } else { - /* Found something thats not a number, find out how much + /* Found something that's not a number, find out how much * it multiplies the built up number by, multiply the total * and reset the built up number. */ diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 956fb1155..a32c07931 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -52,7 +52,7 @@ InspIRCd* ServerInstance = NULL; -/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping +/** Separate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping * if it must. * * This is provided as a pointer so that modules can change it to their custom mapping tables, @@ -544,7 +544,7 @@ InspIRCd::InspIRCd(int argc, char** argv) std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl; /* During startup we read the configuration now, not in - * a seperate thread + * a separate thread */ this->Config->Read(); this->Config->Apply(NULL, ""); @@ -675,7 +675,7 @@ void InspIRCd::Run() UpdateTime(); /* Run background module timers every few seconds - * (the docs say modules shouldnt rely on accurate + * (the docs say modules should not rely on accurate * timing using this event, so we dont have to * time this exactly). */ diff --git a/src/modules.cpp b/src/modules.cpp index 36f5409c4..1668f0215 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -234,7 +234,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Modul } /* Eh? this module doesnt exist, probably trying to set priority on an event - * theyre not attached to. + * they're not attached to. */ return false; @@ -315,7 +315,7 @@ swap_now: bool ModuleManager::PrioritizeHooks() { /* We give every module a chance to re-prioritize when we introduce a new one, - * not just the one thats loading, as the new module could affect the preference + * not just the one that's loading, as the new module could affect the preference * of others */ for (int tries = 0; tries < 20; tries++) diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index ff2a7a032..1db938b44 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -73,7 +73,7 @@ * worker thread wakes up, and checks if there is a request at the head of its queue. * If there is, it processes this request, blocking the worker thread but leaving the ircd * thread to go about its business as usual. During this period, the ircd thread is able - * to insert futher pending requests into the queue. + * to insert further pending requests into the queue. * * Once the processing of a request is complete, it is removed from the incoming queue to * an outgoing queue, and initialized as a 'response'. The worker thread then signals the @@ -90,7 +90,7 @@ * one the module was originally instantiated upon, there is a chance of all hell breaking loose * if a module is ever put in a re-enterant state (stack corruption could occur, crashes, data * corruption, and worse, so DONT think about it until the day comes when InspIRCd is 100% - * gauranteed threadsafe!) + * guaranteed threadsafe!) */ class SQLConnection; @@ -379,7 +379,7 @@ class SQLConnection : public SQL::Provider /* Parse the command string and dispatch it to mysql */ if (CheckConnection() && !mysql_real_query(connection, query.data(), query.length())) { - /* Successfull query */ + /* Successful query */ MYSQL_RES* res = mysql_use_result(connection); unsigned long rows = mysql_affected_rows(connection); return new MySQLresult(res, rows); diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 20c17783a..109725a43 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -273,7 +273,7 @@ class SQLConn : public SQL::Provider, public EventHandler if(PQsetnonblocking(sql, 1) == -1) return false; - /* OK, we've initalised the connection, now to get it hooked into the socket engine + /* OK, we've initialised the connection, now to get it hooked into the socket engine * and then start polling it. */ this->fd = PQsocket(sql); diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index d3857a82e..df7add05c 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -166,7 +166,7 @@ class ModuleAlias : public Module ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE { - /* If theyre not registered yet, we dont want + /* If they're not registered yet, we dont want * to know. */ if (user->registered != REG_ALL) diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index a8728ef72..b575491d6 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -202,7 +202,7 @@ public: parameter = (action.second ? "" : "-") + action.first->uuid; } - /** Will take any number of nicks (up to MaxTargets), which can be seperated by commas. + /** Will take any number of nicks (up to MaxTargets), which can be separated by commas. * - in front of any nick removes, and an * lists. This effectively means you can do: * /accept nick1,nick2,nick3,* * to add 3 nicks and then show your list @@ -243,12 +243,12 @@ public: RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { // There is a list in parameters[0] in two cases: - // Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists, + // Either when the source is remote, this happens because 2.0 servers send comma separated uuid lists, // we don't split those but broadcast them, as before. // // Or if the source is local then LoopCall() runs OnPostCommand() after each entry in the list, // meaning the linking module has sent an ACCEPT already for each entry in the list to the - // appropiate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere. + // appropriate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere. if ((!IS_LOCAL(user)) && (parameters[0].find(',') != std::string::npos)) return ROUTE_BROADCAST; diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index e506efb97..98bcbf4cd 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -189,7 +189,7 @@ class CommandDccallow : public Command , ext(Ext) { syntax = "[(+|-)<nick> [<time>]]|[LIST|HELP]"; - /* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */ + /* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a separate param */ } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 894111a33..786ea673b 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -542,7 +542,7 @@ ModResult ModuleFilter::OnPreCommand(std::string& command, CommandBase::Params& /* We cant block a part or quit, so instead we change the reason to 'Reason filtered' */ parameters[parting ? 1 : 0] = "Reason filtered"; - /* We're warning or blocking, OR theyre quitting and its a KILL action + /* We're warning or blocking, OR they're quitting and its a KILL action * (we cant kill someone whos already quitting, so filter them anyway) */ if ((f->action == FA_WARN) || (f->action == FA_BLOCK) || (((!parting) && (f->action == FA_KILL))) || (f->action == FA_SILENT)) diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 8eb44a03b..b6a9e91c4 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -289,7 +289,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru else rheaders.RemoveHeader("Content-Type"); - /* Supporting Connection: keep-alive causes a whole world of hurt syncronizing timeouts, + /* Supporting Connection: keep-alive causes a whole world of hurt synchronizing timeouts, * so remove it, its not essential for what we need. */ rheaders.SetHeader("Connection", "Close"); diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index df80cd82f..18c79b5d8 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -61,7 +61,7 @@ enum * our ident lookup class that is outside of this module, or out- * side of the control of the class. There are no timers, internal * events, or such, which will cause the socket to be deleted, - * queued for deletion, etc. In fact, theres not even any queueing! + * queued for deletion, etc. In fact, there's not even any queueing! * * Using this framework we have a much more stable module. * @@ -183,7 +183,7 @@ class IdentRequestSocket : public EventHandler void Close() { - /* Remove ident socket from engine, and close it, but dont detatch it + /* Remove ident socket from engine, and close it, but dont detach it * from its parent user class, or attempt to delete its memory. */ if (HasFd()) diff --git a/src/modules/m_ircv3_capnotify.cpp b/src/modules/m_ircv3_capnotify.cpp index ba90cfbde..4a7daaf06 100644 --- a/src/modules/m_ircv3_capnotify.cpp +++ b/src/modules/m_ircv3_capnotify.cpp @@ -164,7 +164,7 @@ class ModuleIRCv3CapNotify : public Module, public Cap::EventListener, public Re void OnReloadModuleRestore(Module* mod, void* data) CXX11_OVERRIDE { - // Reloading can change the set of caps provided by a module so assuming that if the reload succeded all + // Reloading can change the set of caps provided by a module so assuming that if the reload succeeded all // caps that the module previously provided are available or all were lost if the reload failed is wrong. // Instead, we verify the availability of each cap individually. dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager"); diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 86c2f83d5..4bc9c2fad 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -54,7 +54,7 @@ class PermChannel : public ModeHandler } }; -// Not in a class due to circular dependancy hell. +// Not in a class due to circular dependency hell. static std::string permchannelsconf; static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_listmodes) { @@ -152,7 +152,7 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list #ifdef _WIN32 remove(permchannelsconf.c_str()); #endif - // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash. + // Use rename to move temporary to new db - this is guaranteed not to fuck up, even in case of a crash. if (rename(permchannelsnewconf.c_str(), permchannelsconf.c_str()) < 0) { ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", permchannelsconf.c_str(), permchannelsnewconf.c_str(), strerror(errno), errno); diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 27cb42fca..15ba77a34 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -223,7 +223,7 @@ void TreeSocket::SendCapabilities(int phase) this->WriteLine("CAPAB END"); } -/* Isolate and return the elements that are different between two comma seperated lists */ +/* Isolate and return the elements that are different between two comma separated lists */ void TreeSocket::ListDifference(const std::string &one, const std::string &two, char sep, std::string& mleft, std::string& mright) { diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h index 2e280f14f..a1a44daf5 100644 --- a/src/modules/m_spanningtree/commands.h +++ b/src/modules/m_spanningtree/commands.h @@ -139,7 +139,7 @@ class FwdFJoinBuilder; class CommandFJoin : public ServerCommand { /** Remove all modes from a channel, including statusmodes (+qaovh etc), simplemodes, parameter modes. - * This does not update the timestamp of the target channel, this must be done seperately. + * This does not update the timestamp of the target channel, this must be done separately. */ static void RemoveStatus(Channel* c); diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp index aa669ce49..2f9813860 100644 --- a/src/modules/m_spanningtree/ftopic.cpp +++ b/src/modules/m_spanningtree/ftopic.cpp @@ -50,7 +50,7 @@ CmdResult CommandFTopic::Handle(User* user, Params& params) /* * If the topics were updated at the exact same second, accept * the remote only when it's "bigger" than ours as defined by - * string comparision, so non-empty topics always overridde + * string comparison, so non-empty topics always overridde * empty topics if their timestamps are equal * * Similarly, if the topic texts are equal too, keep one topic diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 8d713b2a5..16a1132fe 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -135,7 +135,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) ShowLinks(server, user, hops+1); } } - /* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */ + /* Don't display the line if its a uline, hide ulines is on, and the user isn't an oper */ if ((Utils->HideULines) && (Current->IsULine()) && (!user->IsOper())) return; /* Or if the server is hidden and they're not an oper */ diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 1469885a6..076369493 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -168,7 +168,7 @@ class ModuleSpanningTree */ void DoConnectTimeout(time_t curtime); - /** Handle remote VERSON + /** Handle remote VERSION */ ModResult HandleVersion(const CommandBase::Params& parameters, User* user); diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp index de2830861..80ff832cb 100644 --- a/src/modules/m_spanningtree/override_map.cpp +++ b/src/modules/m_spanningtree/override_map.cpp @@ -144,10 +144,10 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned if (j != child_map.begin()) { // If this child is not my last child, then add | - // to be able to "link" the next server in my list to me, and to indent this childs servers + // to be able to "link" the next server in my list to me, and to indent this children servers if (!last) prefix = "| "; - // Otherwise this is my last child, so just use a space as theres nothing else linked to me below this + // Otherwise this is my last child, so just use a space as there's nothing else linked to me below this else prefix = " "; } diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp index 14a96933d..835744db4 100644 --- a/src/modules/m_spanningtree/resolvers.cpp +++ b/src/modules/m_spanningtree/resolvers.cpp @@ -35,7 +35,7 @@ #include "treesocket.h" /** This class is used to resolve server hostnames during /connect and autoconnect. - * As of 1.1, the resolver system is seperated out from BufferedSocket, so we must do this + * As of 1.1, the resolver system is separated out from BufferedSocket, so we must do this * resolver step first ourselves if we need it. This is totally nonblocking, and will * callback to OnLookupComplete or OnError when completed. Once it has completed we * will have an IP address which we can then use to continue our connection. diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h index 3ef80266a..77b5a48b9 100644 --- a/src/modules/m_spanningtree/resolvers.h +++ b/src/modules/m_spanningtree/resolvers.h @@ -48,7 +48,7 @@ class SecurityIPResolver : public DNS::Request }; /** This class is used to resolve server hostnames during /connect and autoconnect. - * As of 1.1, the resolver system is seperated out from BufferedSocket, so we must do this + * As of 1.1, the resolver system is separated out from BufferedSocket, so we must do this * resolver step first ourselves if we need it. This is totally nonblocking, and will * callback to OnLookupComplete or OnError when completed. Once it has completed we * will have an IP address which we can then use to continue our connection. diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 58f6c745f..6920fc97b 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -127,7 +127,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s * be referenced by its server name. The AddHashEntry() * call below automatically inserts each TreeServer class * into the hash_map as it is created. There is a similar - * maintainance call in the destructor to tidy up deleted + * maintenance call in the destructor to tidy up deleted * servers. */ diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 6b1ca21d0..29c90c843 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -416,7 +416,7 @@ void TreeSocket::Close() // Connection closed. // If the connection is fully up (state CONNECTED) - // then propogate a netsplit to all peers. + // then propagate a netsplit to all peers. if (MyRoot) MyRoot->SQuit(getError(), true); diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index e5061489f..cc5acccf9 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -93,7 +93,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params if (*v == '+') continue; - /* For each mode thats set, find the mode handler and set it on the new user */ + /* For each mode that's set, find the mode handler and set it on the new user */ ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER); if (!mh) throw ProtocolException("Unrecognised mode '" + std::string(1, *v) + "'"); diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp index 5c7f1fca1..c7fca3854 100644 --- a/src/modules/m_sslmodes.cpp +++ b/src/modules/m_sslmodes.cpp @@ -188,7 +188,7 @@ class ModuleSSLModes User* target = msgtarget.Get<User>(); - /* If one or more of the parties involved is a ulined service, we wont stop it. */ + /* If one or more of the parties involved is a ulined service, we won't stop it. */ if (user->server->IsULine() || target->server->IsULine()) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp index e01f56043..838e129c1 100644 --- a/src/modules/m_userip.cpp +++ b/src/modules/m_userip.cpp @@ -53,7 +53,7 @@ class CommandUserip : public Command { if (!checked_privs) { - // Do not trigger the insufficient priviliges message more than once + // Do not trigger the insufficient privileges message more than once checked_privs = true; has_privs = user->HasPrivPermission("users/auspex"); if (!has_privs) diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp index 56537db25..0c2ceceb5 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -156,7 +156,7 @@ class ModuleXLineDB #ifdef _WIN32 remove(xlinedbpath.c_str()); #endif - // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash. + // Use rename to move temporary to new db - this is guaranteed not to fuck up, even in case of a crash. if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0) { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno); diff --git a/src/snomasks.cpp b/src/snomasks.cpp index 6f7f666f6..28533e4bd 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -138,7 +138,7 @@ void Snomask::Send(char letter, const std::string& desc, const std::string& msg) for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i) { User* user = *i; - // IsNoticeMaskSet() returns false for opers who aren't +s, no need to check for it seperately + // IsNoticeMaskSet() returns false for opers who aren't +s, no need to check for it separately if (IS_LOCAL(user) && user->IsNoticeMaskSet(letter)) user->WriteNotice(finalmsg); } diff --git a/src/users.cpp b/src/users.cpp index bd7d046b8..a8142acfb 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -586,7 +586,7 @@ void LocalUser::FullConnect() /* * You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT. * At the time AddClient is called, we don't have a resolved host, by here we probably do - which - * may put the user into a totally seperate class with different restrictions! so we *must* check again. + * may put the user into a totally separate class with different restrictions! so we *must* check again. * Don't remove this! -- w00t */ MyClass = NULL; diff --git a/src/xline.cpp b/src/xline.cpp index 04ac67f68..c2022a1d7 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -119,7 +119,7 @@ class ZLineFactory : public XLineFactory * was added, it iterated every existing line for every existing user. Ow. Expiry was also * expensive, as the lists were NOT sorted. * - * Version 2 moved permanent lines into a seperate list from non-permanent to help optimize + * Version 2 moved permanent lines into a separate list from non-permanent to help optimize * matching speed, but matched in the same way. * Expiry was also sped up by sorting the list by expiry (meaning just remove the items at the * head of the list that are outdated.) @@ -128,7 +128,7 @@ class ZLineFactory : public XLineFactory * than it could have been, something which we address here. * * VERSION 3: - * All lines are (as in v1) stored together -- no seperation of perm and non-perm. They are stored in + * All lines are (as in v1) stored together -- no separation of perm and non-perm. They are stored in * a map of maps (first map is line type, second map is for quick lookup on add/delete/etc). * * Expiry is *no longer* performed on a timer, and no longer uses a sorted list of any variety. This |