diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/channels.h | 6 | ||||
| -rw-r--r-- | include/clientprotocol.h | 2 | ||||
| -rw-r--r-- | include/command_parse.h | 10 | ||||
| -rw-r--r-- | include/configreader.h | 6 | ||||
| -rw-r--r-- | include/ctables.h | 2 | ||||
| -rw-r--r-- | include/extensible.h | 2 | ||||
| -rw-r--r-- | include/hashcomp.h | 10 | ||||
| -rw-r--r-- | include/inspircd.h | 2 | ||||
| -rw-r--r-- | include/inspstring.h | 2 | ||||
| -rw-r--r-- | include/logger.h | 4 | ||||
| -rw-r--r-- | include/mode.h | 12 | ||||
| -rw-r--r-- | include/modules.h | 36 | ||||
| -rw-r--r-- | include/modules/sql.h | 2 | ||||
| -rw-r--r-- | include/modules/ssl.h | 4 | ||||
| -rw-r--r-- | include/protocol.h | 4 | ||||
| -rw-r--r-- | include/socketengine.h | 6 | ||||
| -rw-r--r-- | include/threadengines/threadengine_pthread.h | 2 | ||||
| -rw-r--r-- | include/threadengines/threadengine_win32.h | 2 | ||||
| -rw-r--r-- | include/typedefs.h | 2 | ||||
| -rw-r--r-- | include/usermanager.h | 2 | ||||
| -rw-r--r-- | include/users.h | 4 | ||||
| -rw-r--r-- | include/xline.h | 6 |
22 files changed, 64 insertions, 64 deletions
diff --git a/include/channels.h b/include/channels.h index f01a0434f..c42a64efc 100644 --- a/include/channels.h +++ b/include/channels.h @@ -33,7 +33,7 @@ * This class contains a single element in a channel list, such as a banlist. */ -/** Holds all relevent information for a channel. +/** Holds all relevant information for a channel. * This class represents a channel, and contains its name, modes, topic, topic set time, * etc, and an instance of the BanList type. */ @@ -158,7 +158,7 @@ class CoreExport Channel : public Extensible * @param user The user to add * * The data inserted into the reference list is a table as it is - * an arbitary pointer compared to other users by its memory address, + * an arbitrary pointer compared to other users by its memory address, * as this is a very fast 32 or 64 bit integer comparison. */ Membership* AddUser(User* user); @@ -228,7 +228,7 @@ class CoreExport Channel : public Extensible /** Join a user to an existing channel, without doing any permission checks * @param user The user to join to the channel - * @param privs Priviliges (prefix mode letters) to give to this user, may be NULL + * @param privs Privileges (prefix mode letters) to give to this user, may be NULL * @param bursting True if this join is the result of a netburst (passed to modules in the OnUserJoin hook) * @param created_by_local True if this channel was just created by a local user (passed to modules in the OnUserJoin hook) * @return A newly created Membership object, or NULL if the user was already inside the channel or if the user is a server user diff --git a/include/clientprotocol.h b/include/clientprotocol.h index e0ac78a88..16f08a6f6 100644 --- a/include/clientprotocol.h +++ b/include/clientprotocol.h @@ -700,7 +700,7 @@ class CoreExport ClientProtocol::Serializer : public DataProvider * @param tagname Name of the tag. * @param tagvalue Tag value, may be empty. * @param tags TagMap to place the tag into, if it gets accepted. - * @return True if no error occured, false if the tag name is invalid or if this tag already exists. + * @return True if no error occurred, false if the tag name is invalid or if this tag already exists. */ bool HandleTag(LocalUser* user, const std::string& tagname, std::string& tagvalue, TagMap& tags) const; diff --git a/include/command_parse.h b/include/command_parse.h index 9fd135349..d1a9d5e03 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -28,7 +28,7 @@ /** This class handles command management and parsing. * It allows you to add and remove commands from the map, - * call command handlers by name, and chop up comma seperated + * call command handlers by name, and chop up comma separated * parameters into multiple calls. */ class CoreExport CommandParser @@ -78,7 +78,7 @@ class CoreExport CommandParser */ Command* GetHandler(const std::string &commandname); - /** LoopCall is used to call a command handler repeatedly based on the contents of a comma seperated list. + /** LoopCall is used to call a command handler repeatedly based on the contents of a comma separated list. * There are two ways to call this method, either with one potential list or with two potential lists. * We need to handle two potential lists for JOIN, because a JOIN may contain two lists of items at once: * the channel names and their keys as follows: @@ -101,15 +101,15 @@ class CoreExport CommandParser * If there are two lists and the second list runs out of tokens before the first list then parameters[extra] * will be an EMPTY string when Handle() is called for the remaining tokens in the first list, even if it is * in the middle of parameters[]! Moreover, empty tokens in the second list are allowed, and those will also - * result in the appropiate entry being empty in parameters[]. + * result in the appropriate entry being empty in parameters[]. * This is different than what command handlers usually expect; the command parser only allows an empty param * as the last item in the vector. * * @param user The user who sent the command * @param handler The command handler to call for each parameter in the list * @param parameters Parameter list as a vector of strings - * @param splithere The first parameter index to split as a comma seperated list - * @param extra The second parameter index to split as a comma seperated list, or -1 (the default) if there is only one list + * @param splithere The first parameter index to split as a comma separated list + * @param extra The second parameter index to split as a comma separated list, or -1 (the default) if there is only one list * @param usemax True to limit the command to MaxTargets targets (default), or false to process all tokens * @return This function returns true when it identified a list in the given parameter and finished calling the * command handler for each entry on the list. When this occurs, the caller should return without doing anything, diff --git a/include/configreader.h b/include/configreader.h index 5a775a016..e1f9f01ba 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -313,12 +313,12 @@ class CoreExport ServerConfig CommandLineConf cmdline; /** Clones CIDR range for ipv4 (0-32) - * Defaults to 32 (checks clones on all IPs seperately) + * Defaults to 32 (checks clones on all IPs separately) */ unsigned char c_ipv4_range; /** Clones CIDR range for ipv6 (0-128) - * Defaults to 128 (checks on all IPs seperately) + * Defaults to 128 (checks on all IPs separately) */ unsigned char c_ipv6_range; @@ -332,7 +332,7 @@ class CoreExport ServerConfig std::string XLineMessage; /* Holds the network name the local server - * belongs to. This is an arbitary field defined + * belongs to. This is an arbitrary field defined * by the administrator. */ std::string Network; diff --git a/include/ctables.h b/include/ctables.h index 2049738c9..5a2f94940 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -177,7 +177,7 @@ class CoreExport CommandBase : public ServiceProvider * @param cmd Command name. This must be UPPER CASE. * @param minpara Minimum parameters required for the command. * @param maxpara Maximum number of parameters this command may have - extra parameters - * will be tossed into one last space-seperated param. + * will be tossed into one last space-separated param. */ CommandBase(Module* me, const std::string& cmd, unsigned int minpara = 0, unsigned int maxpara = 0); diff --git a/include/extensible.h b/include/extensible.h index 6c3146884..6b4c4a78a 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -134,7 +134,7 @@ class CoreExport ExtensionItem : public ServiceProvider, public usecountbase * a map associated with the object. In this way modules can store their own custom information within user * objects, channel objects and server objects, without breaking other modules (this is more sensible than using * a flags variable, and each module defining bits within the flag as 'theirs' as it is less prone to conflict and - * supports arbitary data storage). + * supports arbitrary data storage). */ class CoreExport Extensible : public classbase diff --git a/include/hashcomp.h b/include/hashcomp.h index 5626a389d..5308d95c4 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -51,7 +51,7 @@ * mapping arrays internally. *******************************************************/ -/** 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, @@ -114,7 +114,7 @@ namespace irc bool CoreExport operator()(const std::string& a, const std::string& b) const; }; - /** irc::sepstream allows for splitting token seperated lists. + /** irc::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 * false. @@ -177,7 +177,7 @@ namespace irc bool Contains(const std::string& value); }; - /** A derived form of sepstream, which seperates on commas + /** A derived form of sepstream, which separates on commas */ class CoreExport commasepstream : public sepstream { @@ -189,7 +189,7 @@ namespace irc } }; - /** A derived form of sepstream, which seperates on spaces + /** A derived form of sepstream, which separates on spaces */ class CoreExport spacesepstream : public sepstream { @@ -242,7 +242,7 @@ namespace irc bool GetTrailing(std::string& token); }; - /** The portparser class seperates out a port range into integers. + /** The portparser class separates out a port range into integers. * A port range may be specified in the input string in the form * "6660,6661,6662-6669,7020". The end of the stream is indicated by * a return value of 0 from portparser::GetToken(). If you attempt diff --git a/include/inspircd.h b/include/inspircd.h index 11948e2cf..e30933492 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -212,7 +212,7 @@ class CoreExport InspIRCd * Reason for it: * kludge alert! * SendMode expects a User* to send the numeric replies - * back to, so we create it a fake user that isnt in the user + * back to, so we create it a fake user that isn't in the user * hash and set its descriptor to FD_MAGIC_NUMBER so the data * falls into the abyss :p */ diff --git a/include/inspstring.h b/include/inspstring.h index 050a375e1..de0f8be42 100644 --- a/include/inspstring.h +++ b/include/inspstring.h @@ -31,7 +31,7 @@ #include "config.h" #include <cstring> -/** Sets ret to the formated string. last is the last parameter before ..., and format is the format in printf-style */ +/** Sets ret to the formatted string. last is the last parameter before ..., and format is the format in printf-style */ #define VAFORMAT(ret, last, format) \ do { \ va_list _vaList; \ diff --git a/include/logger.h b/include/logger.h index 16c32229a..6af842b79 100644 --- a/include/logger.h +++ b/include/logger.h @@ -50,7 +50,7 @@ class CoreExport FileWriter */ unsigned int flush; - /** Number of write operations that have occured + /** Number of write operations that have occurred */ unsigned int writeops; @@ -126,7 +126,7 @@ typedef std::map<FileWriter*, int> FileLogMap; class CoreExport LogManager : public fakederef<LogManager> { private: - /** Lock variable, set to true when a log is in progress, which prevents further loggging from happening and creating a loop. + /** Lock variable, set to true when a log is in progress, which prevents further logging from happening and creating a loop. */ bool Logging; diff --git a/include/mode.h b/include/mode.h index a7d6ff2b0..97222bf78 100644 --- a/include/mode.h +++ b/include/mode.h @@ -137,7 +137,7 @@ class CoreExport ModeHandler : public ServiceProvider * inside the mode parser as in the 1.0 api, * so the only use of this value (along with * IsListMode()) is for the core to determine - * wether your module can produce 'lists' or not + * whether your module can produce 'lists' or not * (e.g. banlists, etc) */ bool list; @@ -163,7 +163,7 @@ class CoreExport ModeHandler : public ServiceProvider public: /** - * The constructor for ModeHandler initalizes the mode handler. + * The constructor for ModeHandler initializes the mode handler. * The constructor of any class you derive from ModeHandler should * probably call this constructor with the parameters set correctly. * @param me The module which created this mode @@ -293,7 +293,7 @@ class CoreExport ModeHandler : public ServiceProvider /** * If your mode is a listmode, this method will be called to display an empty list (just the end of list numeric) * @param user The user issuing the command - * @param channel The channel tehy're requesting an item list of (e.g. a banlist, or an exception list etc) + * @param channel The channel they're requesting an item list of (e.g. a banlist, or an exception list etc) */ virtual void DisplayEmptyList(User* user, Channel* channel); @@ -311,7 +311,7 @@ class CoreExport ModeHandler : public ServiceProvider /** * When a MODETYPE_USER mode handler is being removed, the core will call this method for every user on the server. - * The usermode will be removed using the appropiate server mode using InspIRCd::SendMode(). + * The usermode will be removed using the appropriate server mode using InspIRCd::SendMode(). * @param user The user which the server wants to remove your mode from */ void RemoveMode(User* user); @@ -765,7 +765,7 @@ class CoreExport ModeParser : public fakederef<ModeParser> /** Find the mode handler for a given mode and type. * @param modeletter mode letter to search for * @param mt type of mode to search for, user or channel - * @returns a pointer to a ModeHandler class, or NULL of there isnt a handler for the given mode + * @returns a pointer to a ModeHandler class, or NULL of there isn't a handler for the given mode */ ModeHandler* FindMode(unsigned const char modeletter, ModeType mt); @@ -782,7 +782,7 @@ class CoreExport ModeParser : public fakederef<ModeParser> */ PrefixMode* FindPrefix(unsigned const char pfxletter); - /** Generates a list of modes, comma seperated by type: + /** Generates a list of modes, comma separated by type: * 1; Listmodes EXCEPT those with a prefix * 2; Modes that take a param when adding or removing * 3; Modes that only take a param when adding diff --git a/include/modules.h b/include/modules.h index 82684cac8..2b578e58c 100644 --- a/include/modules.h +++ b/include/modules.h @@ -185,7 +185,7 @@ class CoreExport Version /** Simple module version */ Version(const std::string &desc, int flags = VF_NONE); - /** Complex version information, including linking compatability data */ + /** Complex version information, including linking compatibility data */ Version(const std::string &desc, int flags, const std::string& linkdata); }; @@ -227,7 +227,7 @@ enum Implementation /** Base class for all InspIRCd modules * This class is the base class for InspIRCd modules. All modules must inherit from this class, * its methods will be called when irc server events occur. class inherited from module must be - * instantiated by the ModuleFactory class (see relevent section) for the module to be initialised. + * instantiated by the ModuleFactory class (see relevant section) for the module to be initialised. */ class CoreExport Module : public classbase, public usecountbase { @@ -446,7 +446,7 @@ class CoreExport Module : public classbase, public usecountbase /** Called after a user opers locally. * This is identical to Module::OnOper(), except it is called after OnOper so that other modules - * can be gauranteed to already have processed the oper-up, for example m_spanningtree has sent + * can be guaranteed to already have processed the oper-up, for example m_spanningtree has sent * out the OPERTYPE, etc. * @param user The user who is opering up * @param opername The name of the oper that the user is opering up to. Only valid locally. Empty string otherwise. @@ -472,7 +472,7 @@ class CoreExport Module : public classbase, public usecountbase virtual ModResult OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout); /** Called after a user has been successfully invited to a channel. - * You cannot prevent the invite from occuring using this function, to do that, + * You cannot prevent the invite from occurring using this function, to do that, * use OnUserPreInvite instead. * @param source The user who is issuing the INVITE * @param dest The user being invited @@ -639,7 +639,7 @@ class CoreExport Module : public classbase, public usecountbase /** Called when a 005 numeric is about to be output. * The module should modify the 005 numeric if needed to indicate its features. - * @param tokens The 005 map to be modified if neccessary. + * @param tokens The 005 map to be modified if necessary. */ virtual void On005Numeric(std::map<std::string, std::string>& tokens); @@ -665,7 +665,7 @@ class CoreExport Module : public classbase, public usecountbase * for example loaded "m_killwidgets.so" with "m_makewidgets.so". It is highly * recommended that modules do *NOT* bail if they cannot satisfy dependencies, * but instead operate under reduced functionality, unless the dependency is - * absolutely neccessary (e.g. a module that extends the features of another + * absolutely necessary (e.g. a module that extends the features of another * module). * @param mod A pointer to the new module */ @@ -678,7 +678,7 @@ class CoreExport Module : public classbase, public usecountbase * for example loaded "m_killwidgets.so" with "m_makewidgets.so". It is highly * recommended that modules do *NOT* bail if they cannot satisfy dependencies, * but instead operate under reduced functionality, unless the dependency is - * absolutely neccessary (e.g. a module that extends the features of another + * absolutely necessary (e.g. a module that extends the features of another * module). * @param mod Pointer to the module being unloaded (still valid) */ @@ -686,18 +686,18 @@ class CoreExport Module : public classbase, public usecountbase /** Called once every five seconds for background processing. * This timer can be used to control timed features. Its period is not accurate - * enough to be used as a clock, but it is gauranteed to be called at least once in + * enough to be used as a clock, but it is guaranteed to be called at least once in * any five second period, directly from the main loop of the server. * @param curtime The current timer derived from time(2) */ virtual void OnBackgroundTimer(time_t curtime); /** Called whenever any command is about to be executed. - * This event occurs for all registered commands, wether they are registered in the core, + * This event occurs for all registered commands, whether they are registered in the core, * or another module, and for invalid commands. Invalid commands may only be sent to this * function when the value of validated is false. By returning 1 from this method you may prevent the * command being executed. If you do this, no output is created by the core, and it is - * down to your module to produce any output neccessary. + * down to your module to produce any output necessary. * Note that unless you return 1, you should not destroy any structures (e.g. by using * InspIRCd::QuitUser) otherwise when the command's handler function executes after your * method returns, it will be passed an invalid pointer to the user object and crash!) @@ -711,7 +711,7 @@ class CoreExport Module : public classbase, public usecountbase virtual ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated); /** Called after any command has been executed. - * This event occurs for all registered commands, wether they are registered in the core, + * This event occurs for all registered commands, whether they are registered in the core, * or another module, but it will not occur for invalid commands (e.g. ones which do not * exist within the command table). The result code returned by the command handler is * provided. @@ -768,7 +768,7 @@ class CoreExport Module : public classbase, public usecountbase virtual ModResult OnUserRegister(LocalUser* user); /** Called whenever a user joins a channel, to determine if invite checks should go ahead or not. - * This method will always be called for each join, wether or not the channel is actually +i, and + * This method will always be called for each join, whether or not the channel is actually +i, and * determines the outcome of an if statement around the whole section of invite checking code. * return 1 to explicitly allow the join to go ahead or 0 to ignore the event. * @param user The user joining the channel @@ -791,7 +791,7 @@ class CoreExport Module : public classbase, public usecountbase virtual ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding); /** Called whenever a user joins a channel, to determine if key checks should go ahead or not. - * This method will always be called for each join, wether or not the channel is actually +k, and + * This method will always be called for each join, whether or not the channel is actually +k, and * determines the outcome of an if statement around the whole section of key checking code. * if the user specified no key, the keygiven string will be a valid but empty value. * return 1 to explicitly allow the join to go ahead or 0 to ignore the event. @@ -803,7 +803,7 @@ class CoreExport Module : public classbase, public usecountbase virtual ModResult OnCheckKey(User* user, Channel* chan, const std::string &keygiven); /** Called whenever a user joins a channel, to determine if channel limit checks should go ahead or not. - * This method will always be called for each join, wether or not the channel is actually +l, and + * This method will always be called for each join, whether or not the channel is actually +l, and * determines the outcome of an if statement around the whole section of channel limit checking code. * return 1 to explicitly allow the join to go ahead or 0 to ignore the event. * @param user The user joining the channel @@ -1057,17 +1057,17 @@ class CoreExport ModuleManager : public fakederef<ModuleManager> void SetPriority(Module* mod, Priority s); /** Attach an event to a module. - * You may later detatch the event with ModuleManager::Detach(). - * If your module is unloaded, all events are automatically detatched. + * You may later detach the event with ModuleManager::Detach(). + * If your module is unloaded, all events are automatically detached. * @param i Event type to attach * @param mod Module to attach event to * @return True if the event was attached */ bool Attach(Implementation i, Module* mod); - /** Detatch an event from a module. + /** Detach an event from a module. * This is not required when your module unloads, as the core will - * automatically detatch your module from all events it is attached to. + * automatically detach your module from all events it is attached to. * @param i Event type to detach * @param mod Module to detach event from * @return True if the event was detached diff --git a/include/modules/sql.h b/include/modules/sql.h index 927d54ee7..47da6f6bf 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -107,7 +107,7 @@ class SQL::Result : public classbase /** * Return the number of rows in the result. * - * Note that if you have perfomed an INSERT or UPDATE query or other + * Note that if you have performed an INSERT or UPDATE query or other * query which will not return rows, this will return the number of * affected rows. In this case you SHOULD NEVER access any of the result * set rows, as there aren't any! diff --git a/include/modules/ssl.h b/include/modules/ssl.h index 01e08b2e2..017502fa9 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -65,7 +65,7 @@ class ssl_cert : public refcountbase return issuer; } - /** Get error string if an error has occured + /** Get error string if an error has occurred * @return The error associated with this users certificate, * or an empty string if there is no error. */ @@ -302,7 +302,7 @@ class UserCertificateAPIBase : public DataProvider } }; -/** API implemented by m_sslinfo that allows modules to retrive the TLS (SSL) certificate +/** API implemented by m_sslinfo that allows modules to retrieve the TLS (SSL) certificate * information of local and remote users. It can also be used to find out whether a * user is using TLS (SSL) or not. */ diff --git a/include/protocol.h b/include/protocol.h index c3a3e8f4b..69f78562a 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -62,7 +62,7 @@ class CoreExport ProtocolInterface * See the protocol documentation for the purpose of ENCAP. * @param targetmask The target server mask (can contain wildcards) * @param cmd The ENCAP subcommand - * @param params List of string parameters which are dependant on the subcommand + * @param params List of string parameters which are dependent on the subcommand * @param source The source of the message (prefix), must be a local user or NULL which means use local server * @return Always true if the target mask contains wildcards; otherwise true if the server name was found, * and the message was sent, false if it was not found. @@ -73,7 +73,7 @@ class CoreExport ProtocolInterface /** Send an ENCAP message to all servers. * See the protocol documentation for the purpose of ENCAP. * @param cmd The ENCAP subcommand - * @param params List of string parameters which are dependant on the subcommand + * @param params List of string parameters which are dependent on the subcommand * @param source The source of the message (prefix), must be a local user or a user behind 'omit' * or NULL which is equivalent to the local server * @param omit If non-NULL the message won't be sent in the direction of this server, useful for forwarding messages diff --git a/include/socketengine.h b/include/socketengine.h index 2b759dad8..8bb8504a6 100644 --- a/include/socketengine.h +++ b/include/socketengine.h @@ -187,7 +187,7 @@ class CoreExport EventHandler : public classbase inline int GetEventMask() const { return event_mask; } - /** Set a new file desciptor + /** Set a new file descriptor * @param FD The new file descriptor. Do not call this method without * first deleting the object from the SocketEngine if you have * added it to a SocketEngine instance. @@ -393,7 +393,7 @@ public: static bool HasFd(int fd); /** Returns the EventHandler attached to a specific fd. - * If the fd isnt in the socketengine, returns NULL. + * If the fd isn't in the socketengine, returns NULL. * @param fd The event handler to look for * @return A pointer to the event handler, or NULL */ @@ -404,7 +404,7 @@ public: * number of events which occurred during this call. This method will * dispatch events to their handlers by calling their * EventHandler::OnEventHandler*() methods. - * @return The number of events which have occured. + * @return The number of events which have occurred. */ static int DispatchEvents(); diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h index d301aaf88..d1810c812 100644 --- a/include/threadengines/threadengine_pthread.h +++ b/include/threadengines/threadengine_pthread.h @@ -70,7 +70,7 @@ class CoreExport ThreadEngine /** The Mutex class represents a mutex, which can be used to keep threads * properly synchronised. Use mutexes sparingly, as they are a good source * of thread deadlocks etc, and should be avoided except where absolutely - * neccessary. Note that the internal behaviour of the mutex varies from OS + * necessary. Note that the internal behaviour of the mutex varies from OS * to OS depending on the thread engine, for example in windows a Mutex * in InspIRCd uses critical sections, as they are faster and simpler to * manage. diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h index 6271db72f..2fdf1cb24 100644 --- a/include/threadengines/threadengine_win32.h +++ b/include/threadengines/threadengine_win32.h @@ -75,7 +75,7 @@ class CoreExport ThreadEngine /** The Mutex class represents a mutex, which can be used to keep threads * properly synchronised. Use mutexes sparingly, as they are a good source * of thread deadlocks etc, and should be avoided except where absolutely - * neccessary. Note that the internal behaviour of the mutex varies from OS + * necessary. Note that the internal behaviour of the mutex varies from OS * to OS depending on the thread engine, for example in windows a Mutex * in InspIRCd uses critical sections, as they are faster and simpler to * manage. diff --git a/include/typedefs.h b/include/typedefs.h index 3222c5d2f..8dc5b4c54 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -134,7 +134,7 @@ typedef std::map<std::string, XLineLookup > XLineContainer; */ typedef XLineContainer::iterator ContainerIter; -/** An interator in an XLineLookup +/** An iterator in an XLineLookup */ typedef XLineLookup::iterator LookupIter; diff --git a/include/usermanager.h b/include/usermanager.h index 2a18393ab..9d7edd34b 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -150,7 +150,7 @@ class CoreExport UserManager : public fakederef<UserManager> */ const CloneCounts& GetCloneCounts(User* user) const; - /** Return a map containg IP addresses and their clone counts + /** Return a map containing IP addresses and their clone counts * @return The clone count map */ const CloneMap& GetCloneMap() const { return clonemap; } diff --git a/include/users.h b/include/users.h index b3afed688..d7a71954e 100644 --- a/include/users.h +++ b/include/users.h @@ -70,7 +70,7 @@ enum UserType { USERTYPE_SERVER = 3 }; -/** Holds information relevent to <connect allow> and <connect deny> tags in the config file. +/** Holds information relevant to <connect allow> and <connect deny> tags in the config file. */ struct CoreExport ConnectClass : public refcountbase { @@ -361,7 +361,7 @@ class CoreExport User : public Extensible /** If this is set to true, then all socket operations for the user * are dropped into the bit-bucket. - * This value is set by QuitUser, and is not needed seperately from that call. + * This value is set by QuitUser, and is not needed separately from that call. * Please note that setting this value alone will NOT cause the user to quit. */ unsigned int quitting:1; diff --git a/include/xline.h b/include/xline.h index fe564358f..75d812581 100644 --- a/include/xline.h +++ b/include/xline.h @@ -29,7 +29,7 @@ /** XLine is the base class for ban lines such as G-lines and K-lines. * Modules may derive from this, and their xlines will automatically be * handled as expected by any protocol modules (e.g. m_spanningtree will - * propogate them using AddLine). The process of translating a type+pattern + * propagate them using AddLine). The process of translating a type+pattern * to a known line type is done by means of an XLineFactory object (see * below). */ @@ -128,7 +128,7 @@ class CoreExport XLine : public classbase */ time_t set_time; - /** The duration of the ban, or 0 if permenant + /** The duration of the ban, or 0 if permanent */ unsigned long duration; @@ -435,7 +435,7 @@ class CoreExport XLineManager */ ~XLineManager(); - /** Split an ident and host into two seperate strings. + /** Split an ident and host into two separate strings. * This allows for faster matching. */ IdentHostPair IdentSplit(const std::string &ident_and_host); |