diff options
48 files changed, 79 insertions, 79 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d94ea0423..7329c6d06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,20 +45,20 @@ if(MINOR_VERSION GREATER 5) set(CMAKE242_OR_BETTER TRUE) else(MINOR_VERSION GREATER 5) set(CMAKE26_OR_BETTER FALSE) - # Also detect if we are using CMake 2.4.8 or better, the FIND sub-command of list() is non-existant in earlier versions + # Also detect if we are using CMake 2.4.8 or better, the FIND sub-command of list() is non-existent in earlier versions if(PATCH_VERSION GREATER 7) set(CMAKE248_OR_BETTER TRUE) set(CMAKE244_OR_BETTER TRUE) set(CMAKE242_OR_BETTER TRUE) else(PATCH_VERSION GREATER 7) set(CMAKE248_OR_BETTER FALSE) - # Also detect if we are using CMake 2.4.4 or better, the CheckCXXCompilerFlag module and SORT sub-command of list() are non-existant in earlier versions + # Also detect if we are using CMake 2.4.4 or better, the CheckCXXCompilerFlag module and SORT sub-command of list() are non-existent in earlier versions if(PATCH_VERSION GREATER 3) set(CMAKE244_OR_BETTER TRUE) set(CMAKE242_OR_BETTER TRUE) else(PATCH_VERSION GREATER 3) set(CMAKE244_OR_BETTER FALSE) - # ALSO detect if we are using CMake 2.4.2 or better, the APPEND sub-command of list() is non-existant in earlier versions + # ALSO detect if we are using CMake 2.4.2 or better, the APPEND sub-command of list() is non-existent in earlier versions if(PATCH_VERSION GREATER 1) set(CMAKE242_OR_BETTER TRUE) else(PATCH_VERSION GREATER 1) @@ -338,12 +338,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINF set(DEBUG_BUILD TRUE) endif(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO") -# Check for the existance of the following include files +# Check for the existence of the following include files check_include_file(cstdint HAVE_CSTDINT) check_include_file(stdint.h HAVE_STDINT_H) check_include_file(strings.h HAVE_STRINGS_H) -# Check for the existance of the following functions +# Check for the existence of the following functions check_function_exists(strcasecmp HAVE_STRCASECMP) check_function_exists(stricmp HAVE_STRICMP) check_function_exists(umask HAVE_UMASK) @@ -370,7 +370,7 @@ echo "" #### echo "Are there any extra arguments you wish to pass to CMake?" -echo "If you need no extra arugments to CMake, enter NONE in all caps." +echo "If you need no extra arguments to CMake, enter NONE in all caps." echo2 "[$EXTRA_CONFIG_ARGS] " if read INPUT ; then : ; else echo "" ; exit 1 ; fi if [ "$INPUT" ] ; then diff --git a/data/example.conf b/data/example.conf index a85e4df5e..50fc7174c 100644 --- a/data/example.conf +++ b/data/example.conf @@ -835,7 +835,7 @@ opertype /* The name of this opertype */ name = "Services Operator" - /* What opertype(s) this inherits from. Seperate with a comma. */ + /* What opertype(s) this inherits from. Separate with a comma. */ inherits = "Helper, Another Helper" /* What commands (see above) this opertype may use */ diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index cda8bc49e..e12d5ec2b 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -398,7 +398,7 @@ command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify" * * Provides the commands: * nickserv/info. - Used for gathering information about an account. - * nickserv/set/hide, nickserv/saset/hide - Used for configuring which options are publically shown in nickserv/info. + * nickserv/set/hide, nickserv/saset/hide - Used for configuring which options are publicly shown in nickserv/info. * */ module { name = "ns_info" } diff --git a/docs/C++CASTING b/docs/C++CASTING index bae24a24c..e1beb8f06 100644 --- a/docs/C++CASTING +++ b/docs/C++CASTING @@ -21,7 +21,7 @@ The syntax is usually *_cast<type>(var). static_cast ----------- -From my expierence, this cast is closest to C-style casting for non-pointer +From my experience, this cast is closest to C-style casting for non-pointer types as well as between some (but not all) pointer types. This type of cast, like C-style casting, is performed at compile-time. static_cast can also do a downcast of a derived class to a base class, but only if the base class is @@ -80,7 +80,7 @@ Bad_cast exception. Note that in Anope we prefer if Anope::debug_cast is used. This uses dynamic_cast (and checks for a NULL pointer return) on debug builds -and static_cast on release builds, to speed up the program beacuse of dynamic_cast's +and static_cast on release builds, to speed up the program because of dynamic_cast's reliance on RTTI. reinterpret_cast diff --git a/docs/CODING b/docs/CODING index d08792869..7dbd5afb3 100644 --- a/docs/CODING +++ b/docs/CODING @@ -1,4 +1,4 @@ -Orginally pulled from: http://www.inspircd.org/wiki/Coding_Guidelines +Originally pulled from: http://www.inspircd.org/wiki/Coding_Guidelines --- diff --git a/docs/Changes b/docs/Changes index fae8b2da9..62242d7c0 100644 --- a/docs/Changes +++ b/docs/Changes @@ -173,8 +173,8 @@ A Added ns_resetpass module to the core A CS ACCESS VIEW which shows who added the access and last time used A Last used time to CS AKICK VIEW A Added a sha_256 encryption module -A Added the ability to load multiple encryption modules, and the ability to seamlessly convert your database between diferent encryptions -A Added configuration options to allow Anope to reconnect if it disconnects from the uplink instead of dieing +A Added the ability to load multiple encryption modules, and the ability to seamlessly convert your database between different encryptions +A Added configuration options to allow Anope to reconnect if it disconnects from the uplink instead of dying A Added support for linking with IPv6 F Unban command to accept an optional nick arg F Some typos in services.conf diff --git a/docs/REDIS b/docs/REDIS index 375d9b4a2..54358d16f 100644 --- a/docs/REDIS +++ b/docs/REDIS @@ -152,7 +152,7 @@ Table of Contents HMSET hash:BotInfo:8 nick redis user redis host services.anope.org realname "Services for IRC Networks" Note if you are using HSET instead of HMSET you will need to use a transaction, as shown in the above example. - If you are watching your services logs you will immediatly see: + If you are watching your services logs you will immediately see: USERS: redis!redis@services.anope.org (Services for IRC Networks) connected to the network (services.anope.org) diff --git a/include/anope.h b/include/anope.h index 638661440..d27aa6546 100644 --- a/include/anope.h +++ b/include/anope.h @@ -543,7 +543,7 @@ namespace Anope extern CoreExport Anope::string Random(size_t len); } -/** sepstream allows for splitting token seperated lists. +/** sepstream allows for splitting token separated lists. * Each successive call to sepstream::GetToken() returns * the next token, until none remain, at which point the method returns * an empty string. @@ -615,7 +615,7 @@ class CoreExport sepstream bool StreamEnd(); }; -/** A derived form of sepstream, which seperates on commas +/** A derived form of sepstream, which separates on commas */ class commasepstream : public sepstream { @@ -625,7 +625,7 @@ class commasepstream : public sepstream commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { } }; -/** A derived form of sepstream, which seperates on spaces +/** A derived form of sepstream, which separates on spaces */ class spacesepstream : public sepstream { diff --git a/include/hashcomp.h b/include/hashcomp.h index 140131e72..1b225de7d 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -123,7 +123,7 @@ namespace ci * @param s1 String to find in * @param n Position to search up to * @param c Character to search for - * @return Pointer to the first occurance of c in s1 + * @return Pointer to the first occurrence of c in s1 */ static const char *find(const char *s1, int n, char c); }; diff --git a/include/lists.h b/include/lists.h index 980f8b533..cb8e0cb64 100644 --- a/include/lists.h +++ b/include/lists.h @@ -52,7 +52,7 @@ class CoreExport NumberList virtual void HandleNumber(unsigned number); /** Called when there is an error with the numbered list - * Return false to immediatly stop processing the list and return + * Return false to immediately stop processing the list and return * This is all done before we start calling HandleNumber, so no numbers will have been processed yet * @param list The list * @return false to stop processing diff --git a/include/modules.h b/include/modules.h index 69e9e6d27..7367e2986 100644 --- a/include/modules.h +++ b/include/modules.h @@ -1016,7 +1016,7 @@ class CoreExport Module : public Extensible */ virtual void OnLogMessage(LogInfo *li, const Log *l, const Anope::string &msg) { throw NotImplementedException(); } - /** Called when a DNS request (question) is recieved. + /** Called when a DNS request (question) is received. * @param req The dns request * @param reply The reply that will be sent */ diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h index 44ffd5a7f..a4f0fe3f5 100644 --- a/include/modules/cs_mode.h +++ b/include/modules/cs_mode.h @@ -80,7 +80,7 @@ struct ModeLocks virtual const ModeLock *GetMLock(const Anope::string &mname, const Anope::string ¶m = "") = 0; /** Get the current mode locks as a string - * @param complete True to show mlock parameters aswell + * @param complete True to show mlock parameters as well * @return A string of mode locks, eg: +nrt */ virtual Anope::string GetMLockAsString(bool complete) const = 0; diff --git a/include/pstdint.h b/include/pstdint.h index fa64dbe70..a8de63fd7 100644 --- a/include/pstdint.h +++ b/include/pstdint.h @@ -73,7 +73,7 @@ * include stdint.h. The hope is that one or the other can be
* used with no real difference.
*
- * 5) In the current verison, if your platform can't represent
+ * 5) In the current version, if your platform can't represent
* int32_t, int16_t and int8_t, it just dumps out with a compiler
* error.
*
diff --git a/include/serialize.h b/include/serialize.h index f83c9bfd3..52efb46aa 100644 --- a/include/serialize.h +++ b/include/serialize.h @@ -65,9 +65,9 @@ class CoreExport Serializable : public virtual Base Serialize::Type *s_type; /* Iterator into serializable_items */ std::list<Serializable *>::iterator s_iter; - /* The hash of the last serialized form of this object commited to the database */ + /* The hash of the last serialized form of this object committed to the database */ size_t last_commit; - /* The last time this object was commited to the database */ + /* The last time this object was committed to the database */ time_t last_commit_time; protected: diff --git a/include/sockets.h b/include/sockets.h index ca61f7efc..129c27c8b 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -372,7 +372,7 @@ class CoreExport ListenSocket : public virtual Socket virtual ~ListenSocket(); /** Process what has come in from the connection - * @return false to destory this socket + * @return false to destroy this socket */ bool ProcessRead(); diff --git a/include/users.h b/include/users.h index 04d1606a4..ea47aaf04 100644 --- a/include/users.h +++ b/include/users.h @@ -44,7 +44,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe Anope::string vident; Anope::string ident; Anope::string uid; - /* If the user is on the access list of the nick theyre on */ + /* If the user is on the access list of the nick they're on */ bool on_access; /* Map of user modes and the params this user has (if any) */ ModeList modes; @@ -103,7 +103,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe * @param svhost The vhost of the user * @param sip The ip of the user * @param sserver The server of the user - * @param srealname The realname/gecos of teh user + * @param srealname The realname/gecos of the user * @param ts User's timestamp * @param smodes User's modes * @param suid The unique identifier of the user. diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 2fc245690..2fba96a9a 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -666,7 +666,7 @@ class CommandCSLevels : public Command { const Anope::string &what = params[2]; - /* Don't allow disabling of the founder level. It would be hard to change it back if you dont have access to use this command */ + /* Don't allow disabling of the founder level. It would be hard to change it back if you don't have access to use this command */ if (what.equals_ci("FOUNDER")) { source.Reply(_("You can not disable the founder privilege because it would be impossible to reenable it at a later time.")); diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp index de6a4f40e..2fd5cb8d1 100644 --- a/modules/commands/cs_ban.cpp +++ b/modules/commands/cs_ban.cpp @@ -118,7 +118,7 @@ class CommandCSBan : public Command if (u != u2 && ci->HasExt("PEACE") && u2_access >= u_access && !source.HasPriv("chanserv/kick")) source.Reply(ACCESS_DENIED); /* - * Dont ban/kick the user on channels where he is excepted + * Don't ban/kick the user on channels where he is excepted * to prevent services <-> server wars. */ else if (c->MatchesList(u2, "EXCEPT")) diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp index b11bc8862..0b36b989b 100644 --- a/modules/commands/cs_mode.cpp +++ b/modules/commands/cs_mode.cpp @@ -921,7 +921,7 @@ class CSMode : public Module } else if (cm->type == MODE_PARAM) { - /* If the channel doesnt have the mode, or it does and it isn't set correctly */ + /* If the channel doesn't have the mode, or it does and it isn't set correctly */ if (ml->set) { Anope::string param; diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp index cfff16377..2559ae301 100644 --- a/modules/commands/cs_set.cpp +++ b/modules/commands/cs_set.cpp @@ -616,7 +616,7 @@ class CommandCSSetPersist : public Command " \n" "If your IRCd has a permanent (persistent) channel mode\n" "and it is set or unset (for any reason, including MODE LOCK),\n" - "persist is automatically set and unset for the channel aswell.\n" + "persist is automatically set and unset for the channel as well.\n" "Additionally, services will set or unset this mode when you\n" "set persist on or off."), BotServ ? BotServ->nick.c_str() : "BotServ", ChanServ ? ChanServ->nick.c_str() : "ChanServ"); diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp index 4524a9831..96cab5b5f 100644 --- a/modules/commands/cs_updown.cpp +++ b/modules/commands/cs_updown.cpp @@ -124,7 +124,7 @@ class CommandCSUp : public Command this->SendSyntax(source); source.Reply(" "); source.Reply(_("Updates a selected nicks status modes on a channel. If \037nick\037 is\n" - "ommited then your status is updated. If \037channel\037 is ommited then\n" + "omitted then your status is updated. If \037channel\037 is omitted then\n" "your channel status is updated on every channel you are in.")); return true; } @@ -221,7 +221,7 @@ class CommandCSDown : public Command this->SendSyntax(source); source.Reply(" "); source.Reply(_("Removes a selected nicks status modes on a channel. If \037nick\037 is\n" - "ommited then your status is removed. If \037channel\037 is ommited then\n" + "omitted then your status is removed. If \037channel\037 is omitted then\n" "your channel status is removed on every channel you are in.")); return true; } diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp index 6fab8919a..f789d785d 100644 --- a/modules/commands/ms_check.cpp +++ b/modules/commands/ms_check.cpp @@ -36,7 +36,7 @@ class CommandMSCheck : public Command MemoInfo *mi = &na->nc->memos; - /* Okay, I know this looks strange but we wanna get the LAST memo, so we + /* Okay, I know this looks strange but we want to get the LAST memo, so we have to loop backwards */ for (unsigned i = mi->memos->size(); i > 0; --i) diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp index 82a3831ff..8dab9200e 100644 --- a/modules/commands/ms_read.cpp +++ b/modules/commands/ms_read.cpp @@ -30,14 +30,14 @@ static void rsend_notify(CommandSource &source, MemoInfo *mi, Memo *m, const Ano if (!nc) return; - /* Text of the memo varies if the recepient was a + /* Text of the memo varies if the recipient was a nick or channel */ Anope::string text = Anope::printf(Language::Translate(na->nc, _("\002[auto-memo]\002 The memo you sent to %s has been viewed.")), targ.c_str()); /* Send notification */ MemoServService->Send(source.GetNick(), m->sender, text, true); - /* Notify recepient of the memo that a notification has + /* Notify recipient of the memo that a notification has been sent to the sender */ source.Reply(_("A notification memo has been sent to %s informing him/her you have\n" "read his/her memo."), nc->display.c_str()); diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp index c3394f14d..63ffe383a 100644 --- a/modules/commands/ms_set.cpp +++ b/modules/commands/ms_set.cpp @@ -254,7 +254,7 @@ class CommandMSSet : public Command " on or when you unset /AWAY.\n" " NEW You will only be notified of memos when they\n" " are sent to you.\n" - " MAIL You will be notified of memos by email aswell as\n" + " MAIL You will be notified of memos by email as well as\n" " any other settings you have.\n" " NOMAIL You will not be notified of memos by email.\n" " OFF You will not receive any notification of memos.\n" diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp index d8f7b2486..2ddff2185 100644 --- a/modules/commands/ns_logout.cpp +++ b/modules/commands/ns_logout.cpp @@ -40,7 +40,7 @@ class CommandNSLogout : public Command if (!nick.empty() && !param.empty() && param.equals_ci("REVALIDATE") && NickServService) NickServService->Validate(u2); - u2->super_admin = false; /* Dont let people logout and remain a SuperAdmin */ + u2->super_admin = false; /* Don't let people logout and remain a SuperAdmin */ Log(LOG_COMMAND, source, this) << "to logout " << u2->nick; /* Remove founder status from this user in all channels */ diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index 27b2e4fe9..2d33931a5 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -687,7 +687,7 @@ static void LoadVHosts() NickAlias *na = NickAlias::Find(nick); if (na == NULL) { - Log() << "Removing vhost for nonexistant nick " << nick; + Log() << "Removing vhost for non-existent nick " << nick; continue; } diff --git a/modules/database/db_redis.cpp b/modules/database/db_redis.cpp index 3cd023ed6..66677e6a8 100644 --- a/modules/database/db_redis.cpp +++ b/modules/database/db_redis.cpp @@ -139,7 +139,7 @@ class DatabaseRedis : public Module, public Pipe { Serialize::Type *t = obj->GetSerializableType(); - /* If there is no id yet for ths object, get one */ + /* If there is no id yet for this object, get one */ if (!obj->id) redis->SendCommand(new IDInterface(this, obj), "INCR id:" + t->GetName()); else diff --git a/modules/extra/stats/m_chanstats.cpp b/modules/extra/stats/m_chanstats.cpp index 27b1b3eae..e21b3641d 100644 --- a/modules/extra/stats/m_chanstats.cpp +++ b/modules/extra/stats/m_chanstats.cpp @@ -424,7 +424,7 @@ class MChanstats : public Module "END;"; this->RunQuery(query); - /* dont prepend any database prefix to events so we can always delete/change old events */ + /* don't prepend any database prefix to events so we can always delete/change old events */ if (this->HasEvent("chanstats_event_cleanup_daily")) { query = "DROP EVENT chanstats_event_cleanup_daily"; diff --git a/modules/fantasy.cpp b/modules/fantasy.cpp index 1bda6c106..c95f6f785 100644 --- a/modules/fantasy.cpp +++ b/modules/fantasy.cpp @@ -149,7 +149,7 @@ class Fantasy : public Module ServiceReference<Command> cmd("Command", info.name); if (!cmd) { - Log(LOG_DEBUG) << "Fantasy command " << it->first << " exists for nonexistant service " << info.name << "!"; + Log(LOG_DEBUG) << "Fantasy command " << it->first << " exists for non-existent service " << info.name << "!"; return; } diff --git a/modules/m_dns.cpp b/modules/m_dns.cpp index dfa2cc969..e6ee8cee1 100644 --- a/modules/m_dns.cpp +++ b/modules/m_dns.cpp @@ -22,7 +22,7 @@ namespace time_t timeout; } -/** A full packet sent or recieved to/from the nameserver +/** A full packet sent or received to/from the nameserver */ class Packet : public Query { @@ -804,7 +804,7 @@ class MyManager : public Manager, public Timer } Packet *packet = new Packet(recv_packet); - packet->flags |= QUERYFLAGS_QR; /* This is a reponse */ + packet->flags |= QUERYFLAGS_QR; /* This is a response */ packet->flags |= QUERYFLAGS_AA; /* And we are authoritative */ packet->answers.clear(); diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index 4e193da01..9fa7e94e9 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -373,7 +373,7 @@ struct IRCDMessageNick : IRCDMessage Server *s = Server::Find(params[6]); if (s == NULL) { - Log(LOG_DEBUG) << "User " << params[0] << " introduced from nonexistant server " << params[6] << "?"; + Log(LOG_DEBUG) << "User " << params[0] << " introduced from non-existent server " << params[6] << "?"; return; } @@ -444,7 +444,7 @@ struct IRCDMessageSJoin : IRCDMessage sju.second = User::Find(buf); if (!sju.second) { - Log(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << params[1]; + Log(LOG_DEBUG) << "SJOIN for non-existent user " << buf << " on " << params[1]; continue; } diff --git a/modules/protocol/charybdis.cpp b/modules/protocol/charybdis.cpp index 0801b58f4..9409c320f 100644 --- a/modules/protocol/charybdis.cpp +++ b/modules/protocol/charybdis.cpp @@ -229,7 +229,7 @@ struct IRCDMessageEUID : IRCDMessage } }; -// we cant use this function from ratbox because we set a local variable here +// we can't use this function from ratbox because we set a local variable here struct IRCDMessageServer : IRCDMessage { IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); } @@ -245,7 +245,7 @@ struct IRCDMessageServer : IRCDMessage } }; -// we cant use this function from ratbox because we set a local variable here +// we can't use this function from ratbox because we set a local variable here struct IRCDMessagePass : IRCDMessage { IRCDMessagePass(Module *creator) : IRCDMessage(creator, "PASS", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); } diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp index 150886232..ba46476d9 100644 --- a/modules/protocol/hybrid.cpp +++ b/modules/protocol/hybrid.cpp @@ -460,7 +460,7 @@ struct IRCDMessageSJoin : IRCDMessage sju.second = User::Find(buf); if (!sju.second) { - Log(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << params[1]; + Log(LOG_DEBUG) << "SJOIN for non-existent user " << buf << " on " << params[1]; continue; } diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 7f080b1d0..e3c61a442 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -949,7 +949,7 @@ struct IRCDMessageFJoin : IRCDMessage sju.second = User::Find(buf); if (!sju.second) { - Log(LOG_DEBUG) << "FJOIN for nonexistant user " << buf << " on " << params[0]; + Log(LOG_DEBUG) << "FJOIN for non-existent user " << buf << " on " << params[0]; continue; } @@ -1175,7 +1175,7 @@ struct IRCDMessageOperType : IRCDMessage void Run(MessageSource &source, const std::vector<Anope::string> ¶ms) anope_override { /* opertype is equivalent to mode +o because servers - dont do this directly */ + don't do this directly */ User *u = source.GetUser(); if (!u->HasMode("OPER")) u->SetModesInternal(source, "+o"); @@ -1371,7 +1371,7 @@ class ProtoInspIRCd12 : public Module /* InspIRCd 1.2 doesn't set -r on nick change, remove -r here. Note that if we have to set +r later * this will cancel out this -r, resulting in no mode changes. * - * Do not set -r if we dont have a NickServ loaded - DP + * Do not set -r if we don't have a NickServ loaded - DP */ BotInfo *NickServ = Config->GetClient("NickServ"); if (NickServ) diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp index 28f68007b..4ea9a15ec 100644 --- a/modules/protocol/ngircd.cpp +++ b/modules/protocol/ngircd.cpp @@ -451,7 +451,7 @@ struct IRCDMessageNick : IRCDMessage Server *s = Server::Find(params[4]); if (s == NULL) { - Log(LOG_DEBUG) << "User " << params[0] << " introduced from nonexistant server " << params[4] << "?"; + Log(LOG_DEBUG) << "User " << params[0] << " introduced from non-existent server " << params[4] << "?"; return; } User::OnIntroduce(params[0], params[2], params[3], "", "", s, params[6], Anope::CurTime, params[5], "", NULL); @@ -500,7 +500,7 @@ struct IRCDMessageNJoin : IRCDMessage sju.second = User::Find(buf); if (!sju.second) { - Log(LOG_DEBUG) << "NJOIN for nonexistant user " << buf << " on " << params[0]; + Log(LOG_DEBUG) << "NJOIN for non-existent user " << buf << " on " << params[0]; continue; } users.push_back(sju); @@ -587,7 +587,7 @@ struct IRCDMessageTopic : IRCDMessage Channel *c = Channel::Find(params[0]); if (!c) { - Log(LOG_DEBUG) << "TOPIC for nonexistant channel " << params[0]; + Log(LOG_DEBUG) << "TOPIC for non-existent channel " << params[0]; return; } c->ChangeTopicInternal(source.GetUser(), source.GetName(), params[1], Anope::CurTime); diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index 8ccabd604..da033d3f5 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -172,7 +172,7 @@ struct IRCDMessageTBurst : IRCDMessage * params[0] = channel * params[1] = ts * params[2] = topic OR who set the topic - * params[3] = topic if params[2] isnt the topic + * params[3] = topic if params[2] isn't the topic */ void Run(MessageSource &source, const std::vector<Anope::string> ¶ms) anope_override { diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index ef8393b74..dccfdc91b 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -576,7 +576,7 @@ class ChannelModeFlood : public ChannelModeParam while (p < arg.length() && isdigit(arg[p])) ++p; if (p == arg.length() || !(arg[p] == 'c' || arg[p] == 'j' || arg[p] == 'k' || arg[p] == 'm' || arg[p] == 'n' || arg[p] == 't')) - continue; /* continue instead of break for forward compatability. */ + continue; /* continue instead of break for forward compatibility. */ try { int v = arg.substr(0, p).is_number_only() ? convertTo<int>(arg.substr(0, p)) : 0; @@ -908,7 +908,7 @@ struct IRCDMessageNick : IRCDMessage Server *s = Server::Find(params[5]); if (s == NULL) { - Log(LOG_DEBUG) << "User " << params[0] << " introduced from nonexistant server " << params[5] << "?"; + Log(LOG_DEBUG) << "User " << params[0] << " introduced from non-existent server " << params[5] << "?"; return; } @@ -992,7 +992,7 @@ struct IRCDMessageSetHost : IRCDMessage { User *u = source.GetUser(); - /* When a user sets +x we recieve the new host and then the mode change */ + /* When a user sets +x we receive the new host and then the mode change */ if (u->HasMode("CLOAK")) u->SetDisplayedHost(params[0]); else @@ -1096,7 +1096,7 @@ struct IRCDMessageSJoin : IRCDMessage sju.second = User::Find(buf); if (!sju.second) { - Log(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << params[1]; + Log(LOG_DEBUG) << "SJOIN for non-existent user " << buf << " on " << params[1]; continue; } diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp index 55c57b974..2d32eb502 100644 --- a/modules/pseudoclients/botserv.cpp +++ b/modules/pseudoclients/botserv.cpp @@ -90,7 +90,7 @@ class BotServCore : public Module { /** * We let the bot join even if it was an ignored user, as if we don't, - * and the ignored user doesnt just leave, the bot will never + * and the ignored user doesn't just leave, the bot will never * make it into the channel, leaving the channel botless even for * legit users - Rob **/ @@ -109,7 +109,7 @@ class BotServCore : public Module if (c->ci && persist && persist->HasExt(c->ci)) return; - /* Channel is syncing from a netburst, don't destroy it as more users are probably wanting to join immediatly + /* Channel is syncing from a netburst, don't destroy it as more users are probably wanting to join immediately * We also don't part the bot here either, if necessary we will part it after the sync */ if (c->syncing) diff --git a/src/channels.cpp b/src/channels.cpp index 7e7702d7e..e61e0de5f 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -121,7 +121,7 @@ void Channel::CheckModes() bool Channel::CheckDelete() { - /* Channel is syncing from a netburst, don't destroy it as more users are probably wanting to join immediatly + /* Channel is syncing from a netburst, don't destroy it as more users are probably wanting to join immediately * We also don't part the bot here either, if necessary we will part it after the sync */ if (this->syncing) @@ -160,10 +160,10 @@ void Channel::DeleteUser(User *user) ChanUserContainer *cu = user->FindChannel(this); if (!this->users.erase(user)) - Log(LOG_DEBUG) << "Channel::DeleteUser() tried to delete nonexistant user " << user->nick << " from channel " << this->name; + Log(LOG_DEBUG) << "Channel::DeleteUser() tried to delete non-existent user " << user->nick << " from channel " << this->name; if (!user->chans.erase(this)) - Log(LOG_DEBUG) << "Channel::DeleteUser() tried to delete nonexistant channel " << this->name << " from " << user->nick << "'s channel list"; + Log(LOG_DEBUG) << "Channel::DeleteUser() tried to delete non-existent channel " << this->name << " from " << user->nick << "'s channel list"; delete cu; if (this->CheckDelete()) @@ -279,7 +279,7 @@ void Channel::SetModeInternal(MessageSource &setter, ChannelMode *ocm, const Ano if (!u) { - Log() << "MODE " << this->name << " +" << cm->mchar << " for nonexistant user " << param; + Log() << "MODE " << this->name << " +" << cm->mchar << " for non-existent user " << param; return; } @@ -350,7 +350,7 @@ void Channel::RemoveModeInternal(MessageSource &setter, ChannelMode *ocm, const if (!u) { - Log() << "Channel::RemoveModeInternal() MODE " << this->name << "-" << cm->mchar << " for nonexistant user " << param; + Log() << "Channel::RemoveModeInternal() MODE " << this->name << "-" << cm->mchar << " for non-existent user " << param; return; } @@ -656,7 +656,7 @@ void Channel::SetModesInternal(MessageSource &source, const Anope::string &mode, if (cm->type == MODE_REGULAR) { - /* something changed if we are adding a mode we dont have, or removing one we have */ + /* something changed if we are adding a mode we don't have, or removing one we have */ changed |= !!add != this->HasMode(cm->name); if (add) this->SetModeInternal(source, cm, "", false); @@ -691,7 +691,7 @@ void Channel::SetModesInternal(MessageSource &source, const Anope::string &mode, this->RemoveModeInternal(source, cm, token, enforce_mlock); } else - Log() << "warning: Channel::SetModesInternal() recieved more modes requiring params than params, modes: " << mode; + Log() << "warning: Channel::SetModesInternal() received more modes requiring params than params, modes: " << mode; } if (!this_reference) diff --git a/src/extensible.cpp b/src/extensible.cpp index 37206f7c1..39f386d6c 100644 --- a/src/extensible.cpp +++ b/src/extensible.cpp @@ -63,7 +63,7 @@ bool* Extensible::Extend(const Anope::string &name, const bool &what) if (ref) return ref->Set(this); - Log(LOG_DEBUG) << "Extend for nonexistant type " << name << " on " << static_cast<void *>(this); + Log(LOG_DEBUG) << "Extend for non-existent type " << name << " on " << static_cast<void *>(this); return NULL; } diff --git a/src/init.cpp b/src/init.cpp index e6bc8e150..6d903ac8f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,4 +1,4 @@ -/* Initalization and related routines. +/* Initialization and related routines. * * (C) 2003-2014 Anope Team * Contact us at team@anope.org diff --git a/src/language.cpp b/src/language.cpp index 5ff344281..c2643f438 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -88,7 +88,7 @@ const char *Language::Translate(const char *lang, const char *string) SetThreadLocale(MAKELCID(MAKELANGID(WindowsGetLanguage(lang), SUBLANG_DEFAULT), SORT_DEFAULT)); #else /* First, set LANG and LANGUAGE env variables. - * Some systems (Debian) don't care about this, so we must setlocale LC_ALL aswell. + * Some systems (Debian) don't care about this, so we must setlocale LC_ALL as well. * BUT if this call fails because the LANGUAGE env variable is set, setlocale resets * the locale to "C", which short circuits gettext and causes it to fail on systems that * use the LANGUAGE env variable. We must reset the locale to en_US (or, anything not diff --git a/src/modes.cpp b/src/modes.cpp index 38266f95f..51b31bb7b 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -290,7 +290,7 @@ void StackerInfo::AddMode(Mode *mode, bool set, const Anope::string ¶m) break; } } - /* If the mode is on the other list, remove it from there (eg, we dont want +o-o Adam Adam) */ + /* If the mode is on the other list, remove it from there (eg, we don't want +o-o Adam Adam) */ for (it = otherlist->begin(), it_end = otherlist->end(); it != it_end; ++it) { /* The param must match too (can have multiple status or list modes), but @@ -320,7 +320,7 @@ static class ModePipe : public Pipe } } *modePipe; -/** Get the stacker info for an item, if one doesnt exist it is created +/** Get the stacker info for an item, if one doesn't exist it is created * @param Item The user/channel etc * @return The stacker info */ diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index b6df3578a..06a3c2181 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -435,8 +435,8 @@ bool ModuleManager::SetPriority(Module *mod, Implementation i, Priority s, Modul break; } - /* Eh? this module doesnt exist, probably trying to set priority on an event - * theyre not attached to. + /* Eh? this module doesn't exist, probably trying to set priority on an event + * they're not attached to. */ if (!found) return false; diff --git a/src/tools/geoipupdate.sh b/src/tools/geoipupdate.sh index 0b02dae36..641ac3259 100644 --- a/src/tools/geoipupdate.sh +++ b/src/tools/geoipupdate.sh @@ -5,7 +5,7 @@ # them into existing mysql tables. The tables are created # by the irc2sql module on the first load. -# Dont forget to rename this file or your changes +# Don't forget to rename this file or your changes # will be overwritte on the next 'make install' ############################ diff --git a/src/win32/socket.cpp b/src/win32/socket.cpp index d481515d3..211999f9a 100644 --- a/src/win32/socket.cpp +++ b/src/win32/socket.cpp @@ -51,7 +51,7 @@ int windows_accept(int fd, struct sockaddr *addr, int *addrlen) * @param af The protocol type, AF_INET or AF_INET6 * @param src The address * @param dst Struct to put results in - * @return 1 on sucess, -1 on error + * @return 1 on success, -1 on error */ int windows_inet_pton(int af, const char *src, void *dst) { diff --git a/src/win32/windows.cpp b/src/win32/windows.cpp index 3ef1bcfa9..997260581 100644 --- a/src/win32/windows.cpp +++ b/src/win32/windows.cpp @@ -194,7 +194,7 @@ Anope::string GetWindowsVersion() buf = "Microsoft Windows 98" + extra; } if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 90) - buf = "Microsoft Windows Millenium Edition"; + buf = "Microsoft Windows Millennium Edition"; } return buf; } |