From 76ce8ece1a4803c98bfe9460f40bf8e0fbc409e6 Mon Sep 17 00:00:00 2001 From: Robby Date: Tue, 17 Jan 2017 05:03:25 +0100 Subject: Cleanup some excess whitespaces and tabs, and fix a few typos along the way. --- include/account.h | 6 ++-- include/anope.h | 4 +-- include/language.h | 2 +- include/messages.h | 68 ++++++++++++++++++++++---------------------- include/modes.h | 2 +- include/modules.h | 4 +-- include/modules/dns.h | 8 +++--- include/modules/os_ignore.h | 2 +- include/modules/os_news.h | 6 ++-- include/modules/os_session.h | 2 +- include/modules/redis.h | 2 +- include/modules/ssl.h | 2 +- include/modules/xmlrpc.h | 2 +- include/opertype.h | 2 +- include/protocol.h | 2 +- include/pstdint.h | 24 ++++++++-------- include/regchannel.h | 2 +- include/version.cpp | 2 +- 18 files changed, 71 insertions(+), 71 deletions(-) (limited to 'include') diff --git a/include/account.h b/include/account.h index e4af5fb73..7a0f8a61d 100644 --- a/include/account.h +++ b/include/account.h @@ -25,7 +25,7 @@ extern CoreExport Serialize::Checker NickAliasList; extern CoreExport Serialize::Checker NickCoreList; /* A registered nickname. - * It matters that Base is here before Extensible (it is inherited by Serializable) + * It matters that Base is here before Extensible (it is inherited by Serializable) */ class CoreExport NickAlias : public Serializable, public Extensible { @@ -214,7 +214,7 @@ class CoreExport NickCore : public Serializable, public Extensible * @return The account, if it exists */ static NickCore* Find(const Anope::string &nick); - + void AddChannelReference(ChannelInfo *ci); void RemoveChannelReference(ChannelInfo *ci); void GetChannelReferences(std::deque &queue); @@ -234,7 +234,7 @@ class CoreExport IdentifyRequest std::set holds; bool dispatched; bool success; - + static std::set Requests; protected: diff --git a/include/anope.h b/include/anope.h index 18367a623..cb26f0ce6 100644 --- a/include/anope.h +++ b/include/anope.h @@ -443,13 +443,13 @@ namespace Anope */ extern CoreExport void Unhex(const string &src, string &dest); extern CoreExport void Unhex(const string &src, char *dest, size_t sz); - + /** Base 64 encode a string * @param src The string to encode * @param target Where the encoded string is placed */ extern CoreExport void B64Encode(const string &src, string &target); - + /** Base 64 decode a string * @param src The base64 encoded string * @param target The plain text result diff --git a/include/language.h b/include/language.h index 935f77ee7..a30165d81 100644 --- a/include/language.h +++ b/include/language.h @@ -23,7 +23,7 @@ namespace Language * and we detect a language file exists for at least one of the supported * languages for the module, then we add the module's domain (its name) * here. - * + * * When strings are translated they are checked against all domains. */ extern std::vector Domains; diff --git a/include/messages.h b/include/messages.h index 40a2b363f..3ea70546c 100644 --- a/include/messages.h +++ b/include/messages.h @@ -22,21 +22,21 @@ namespace Message struct CoreExport Away : IRCDMessage { Away(Module *creator, const Anope::string &mname = "AWAY") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Capab : IRCDMessage { Capab(Module *creator, const Anope::string &mname = "CAPAB") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Error : IRCDMessage { Error(Module *creator, const Anope::string &mname = "ERROR") : IRCDMessage(creator, mname, 1) { } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; @@ -46,15 +46,15 @@ namespace Message void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Join : IRCDMessage { Join(Module *creator, const Anope::string &mname = "JOIN") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; - + typedef std::pair SJoinUser; - + /** Handle a SJOIN. * @param source The source of the SJOIN * @param chan The channel the users are joining to @@ -64,18 +64,18 @@ namespace Message */ static void SJoin(MessageSource &source, const Anope::string &chan, time_t ts, const Anope::string &modes, const std::list &users); }; - + struct CoreExport Kick : IRCDMessage { Kick(Module *creator, const Anope::string &mname = "KICK") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Kill : IRCDMessage { Kill(Module *creator, const Anope::string &mname = "KILL") : IRCDMessage(creator, mname, 2) { } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; @@ -85,14 +85,14 @@ namespace Message void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport MOTD : IRCDMessage { MOTD(Module *creator, const Anope::string &mname = "MOTD") : IRCDMessage(creator, mname, 1) { } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Notice : IRCDMessage { Notice(Module *creator, const Anope::string &mname = "NOTICE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } @@ -103,70 +103,70 @@ namespace Message struct CoreExport Part : IRCDMessage { Part(Module *creator, const Anope::string &mname = "PART") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Ping : IRCDMessage { Ping(Module *creator, const Anope::string &mname = "PING") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Privmsg : IRCDMessage { Privmsg(Module *creator, const Anope::string &mname = "PRIVMSG") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Quit : IRCDMessage { Quit(Module *creator, const Anope::string &mname = "QUIT") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport SQuit : IRCDMessage { SQuit(Module *creator, const Anope::string &mname = "SQUIT") : IRCDMessage(creator, mname, 2) { } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Stats : IRCDMessage { Stats(Module *creator, const Anope::string &mname = "STATS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Time : IRCDMessage { Time(Module *creator, const Anope::string &mname = "TIME") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Topic : IRCDMessage { Topic(Module *creator, const Anope::string &mname = "TOPIC") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Version : IRCDMessage { Version(Module *creator, const Anope::string &mname = "VERSION") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; - + struct CoreExport Whois : IRCDMessage { Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - + void Run(MessageSource &source, const std::vector ¶ms) anope_override; }; diff --git a/include/modes.h b/include/modes.h index 9f7ce38b2..0886cb0fd 100644 --- a/include/modes.h +++ b/include/modes.h @@ -197,7 +197,7 @@ class CoreExport ChannelModeStatus : public ChannelMode /** constructor * @param name The mode name * @param mc The mode char - * @param msymbol The symbol for the mode, eg @ % + * @param msymbol The symbol for the mode, eg @ % * @param mlevel A level for the mode, which is usually determined by the PREFIX capab */ ChannelModeStatus(const Anope::string &name, char mc, char msymbol, short mlevel); diff --git a/include/modules.h b/include/modules.h index 068b3ae36..95b02f29a 100644 --- a/include/modules.h +++ b/include/modules.h @@ -72,7 +72,7 @@ /** * This #define allows us to call a method in all * loaded modules in a readable simple way, e.g.: - * + * * FOREACH_MOD(OnUserConnect, (user, exempt)); */ #define FOREACH_MOD(ename, args) \ @@ -104,7 +104,7 @@ else \ * This define is similar to the one above but returns a result. * The first module to return a result other than EVENT_CONTINUE is the value to be accepted, * and any modules after are ignored. This is used like: - * + * * EventReturn MOD_RESULT; * FOREACH_RESULT(OnUserConnect, MOD_RESULT, (user, exempt)); */ diff --git a/include/modules/dns.h b/include/modules/dns.h index 69e92e68b..7e8de8d8a 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -78,11 +78,11 @@ namespace DNS Question() : type(QUERY_NONE), qclass(0) { } Question(const Anope::string &n, QueryType t, unsigned short c = 1) : name(n), type(t), qclass(c) { } - inline bool operator==(const Question & other) const { return name == other.name && type == other.type && qclass == other.qclass; } + inline bool operator==(const Question & other) const { return name == other.name && type == other.type && qclass == other.qclass; } struct hash { - size_t operator()(const Question &q) const + size_t operator()(const Question &q) const { return Anope::hash_ci()(q.name); } @@ -94,7 +94,7 @@ namespace DNS unsigned int ttl; Anope::string rdata; time_t created; - + ResourceRecord(const Anope::string &n, QueryType t, unsigned short c = 1) : Question(n, t, c), ttl(0), created(Anope::CurTime) { } ResourceRecord(const Question &q) : Question(q), ttl(0), created(Anope::CurTime) { } }; @@ -104,7 +104,7 @@ namespace DNS std::vector questions; std::vector answers, authorities, additional; Error error; - + Query() : error(ERROR_NONE) { } Query(const Question &q) : error(ERROR_NONE) { questions.push_back(q); } }; diff --git a/include/modules/os_ignore.h b/include/modules/os_ignore.h index 6d3680abb..3fc83fd41 100644 --- a/include/modules/os_ignore.h +++ b/include/modules/os_ignore.h @@ -25,7 +25,7 @@ class IgnoreService : public Service { protected: IgnoreService(Module *c) : Service(c, "IgnoreService", "ignore") { } - + public: virtual void AddIgnore(IgnoreData *) = 0; diff --git a/include/modules/os_news.h b/include/modules/os_news.h index c431071eb..3b473bf70 100644 --- a/include/modules/os_news.h +++ b/include/modules/os_news.h @@ -39,11 +39,11 @@ class NewsService : public Service NewsService(Module *m) : Service(m, "NewsService", "news") { } virtual NewsItem *CreateNewsItem() = 0; - + virtual void AddNewsItem(NewsItem *n) = 0; - + virtual void DelNewsItem(NewsItem *n) = 0; - + virtual std::vector &GetNewsList(NewsType t) = 0; }; diff --git a/include/modules/os_session.h b/include/modules/os_session.h index cdb089800..67ad84692 100644 --- a/include/modules/os_session.h +++ b/include/modules/os_session.h @@ -48,7 +48,7 @@ class SessionService : public Service virtual Exception *FindException(User *u) = 0; - virtual Exception *FindException(const Anope::string &host) = 0; + virtual Exception *FindException(const Anope::string &host) = 0; virtual ExceptionVector &GetExceptions() = 0; diff --git a/include/modules/redis.h b/include/modules/redis.h index 4bb62c7c6..fbcecebf7 100644 --- a/include/modules/redis.h +++ b/include/modules/redis.h @@ -23,7 +23,7 @@ namespace Redis Reply() { Clear(); } ~Reply() { Clear(); } - + void Clear() { type = NOT_PARSED; diff --git a/include/modules/ssl.h b/include/modules/ssl.h index 5d3ae2b97..bcda29537 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -10,6 +10,6 @@ class SSLService : public Service { public: SSLService(Module *o, const Anope::string &n) : Service(o, "SSLService", n) { } - + virtual void Init(Socket *s) = 0; }; diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h index dc1e9d259..0447f9012 100644 --- a/include/modules/xmlrpc.h +++ b/include/modules/xmlrpc.h @@ -17,7 +17,7 @@ class XMLRPCRequest Anope::string id; std::deque data; HTTPReply& r; - + XMLRPCRequest(HTTPReply &_r) : r(_r) { } inline void reply(const Anope::string &dname, const Anope::string &ddata) { this->replies.insert(std::make_pair(dname, ddata)); } inline const std::map &get_replies() { return this->replies; } diff --git a/include/opertype.h b/include/opertype.h index 2490ce727..69ef6885d 100644 --- a/include/opertype.h +++ b/include/opertype.h @@ -33,7 +33,7 @@ struct CoreExport Oper virtual ~Oper(); static std::vector opers; - + /** Find an oper block by name * @param name The name * @return the oper block diff --git a/include/protocol.h b/include/protocol.h index 08d4c304d..635399653 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -195,7 +195,7 @@ class CoreExport IRCDProto : public Service * initial handshake requirements. */ virtual void SendConnect() = 0; - + /** Called right before we begin our burst, after we have handshaked successfully with the uplink. * At this point none of our servers, users, or channels exist on the uplink */ diff --git a/include/pstdint.h b/include/pstdint.h index a8de63fd7..b034ae086 100644 --- a/include/pstdint.h +++ b/include/pstdint.h @@ -5,11 +5,11 @@ * * Copyright (c) 2005-2011 Paul Hsieh * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -730,15 +730,15 @@ typedef uint_least32_t uint_fast32_t; #if defined (__TEST_PSTDINT_FOR_CORRECTNESS) -/* +/* * Please compile with the maximum warning settings to make sure macros are not * defined more than once. */ - + #include #include #include - + #define glue3_aux(x,y,z) x ## y ## z #define glue3(x,y,z) glue3_aux(x,y,z) @@ -748,7 +748,7 @@ typedef uint_least32_t uint_fast32_t; #define DECL(us,bits) glue3(DECL,us,) (bits) #define TESTUMAX(bits) glue3(u,bits,=) glue3(~,u,bits); if (glue3(UINT,bits,_MAX) glue3(!=,u,bits)) printf ("Something wrong with UINT%d_MAX\n", bits) - + int main () { DECL(I,8) DECL(U,8) @@ -765,7 +765,7 @@ int main () { char str0[256], str1[256]; sprintf (str0, "%d %x\n", 0, ~0); - + sprintf (str1, "%d %x\n", i8, ~0); if (0 != strcmp (str0, str1)) printf ("Something wrong with i8 : %s\n", str1); sprintf (str1, "%u %x\n", u8, ~0); @@ -773,20 +773,20 @@ int main () { sprintf (str1, "%d %x\n", i16, ~0); if (0 != strcmp (str0, str1)) printf ("Something wrong with i16 : %s\n", str1); sprintf (str1, "%u %x\n", u16, ~0); - if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1); + if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1); sprintf (str1, "%" PRINTF_INT32_MODIFIER "d %x\n", i32, ~0); if (0 != strcmp (str0, str1)) printf ("Something wrong with i32 : %s\n", str1); sprintf (str1, "%" PRINTF_INT32_MODIFIER "u %x\n", u32, ~0); if (0 != strcmp (str0, str1)) printf ("Something wrong with u32 : %s\n", str1); -#ifdef INT64_MAX +#ifdef INT64_MAX sprintf (str1, "%" PRINTF_INT64_MODIFIER "d %x\n", i64, ~0); if (0 != strcmp (str0, str1)) printf ("Something wrong with i64 : %s\n", str1); #endif sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "d %x\n", imax, ~0); if (0 != strcmp (str0, str1)) printf ("Something wrong with imax : %s\n", str1); sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "u %x\n", umax, ~0); - if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1); - + if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1); + TESTUMAX(8); TESTUMAX(16); TESTUMAX(32); diff --git a/include/regchannel.h b/include/regchannel.h index 65186add6..ef6d84fa8 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -231,7 +231,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible */ Anope::string GetIdealBan(User *u) const; - /** Finds a ChannelInfo + /** Finds a ChannelInfo * @param name channel name to lookup * @return the ChannelInfo associated with the channel */ diff --git a/include/version.cpp b/include/version.cpp index 7b7ff321e..2e712c46f 100644 --- a/include/version.cpp +++ b/include/version.cpp @@ -28,7 +28,7 @@ static std::string get_git_hash(const std::string &git_dir) fd.close(); return ""; } - + fd.close(); filebuf = filebuf.substr(5); -- cgit