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. --- modules/extra/m_ldap.cpp | 5 ++--- modules/extra/m_ldap_authentication.cpp | 2 +- modules/extra/m_mysql.cpp | 5 ++--- modules/extra/m_regex_pcre.cpp | 2 +- modules/extra/m_sqlite.cpp | 3 +-- modules/extra/m_ssl_openssl.cpp | 8 ++++---- modules/extra/stats/cs_fantasy_stats.cpp | 1 - modules/extra/stats/cs_fantasy_top.cpp | 3 +-- modules/extra/stats/irc2sql/CMakeLists.txt | 1 - modules/extra/stats/irc2sql/irc2sql.h | 2 -- modules/extra/stats/irc2sql/utils.cpp | 1 - modules/extra/stats/m_chanstats.cpp | 3 +-- 12 files changed, 13 insertions(+), 23 deletions(-) (limited to 'modules/extra') diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp index a98b786fc..a8a4ba38c 100644 --- a/modules/extra/m_ldap.cpp +++ b/modules/extra/m_ldap.cpp @@ -269,7 +269,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition ldap_unbind_ext(this->con, NULL, NULL); } - + void BindAsAdmin(LDAPInterface *i) anope_override { this->Bind(i, this->admin_binddn, this->admin_pass); @@ -575,7 +575,7 @@ class ModuleLDAP : public Module, public Pipe delete req; } - } + } } }; @@ -619,4 +619,3 @@ int LDAPModify::run() } MODULE_INIT(ModuleLDAP) - diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp index 30f36501e..4aaafb4a2 100644 --- a/modules/extra/m_ldap_authentication.cpp +++ b/modules/extra/m_ldap_authentication.cpp @@ -29,7 +29,7 @@ struct IdentifyInfo { req->Hold(me); } - + ~IdentifyInfo() { req->Release(me); diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp index 11b6f4c60..72cf889c4 100644 --- a/modules/extra/m_mysql.cpp +++ b/modules/extra/m_mysql.cpp @@ -456,7 +456,7 @@ Query MySQLService::BuildInsert(const Anope::string &table, unsigned int id, Dat query.SetValue(it->first, buf, escape); } - + return query; } @@ -476,7 +476,7 @@ void MySQLService::Connect() if (!connect) throw SQL::Exception("Unable to connect to MySQL service " + this->name + ": " + mysql_error(this->sql)); - + Log(LOG_DEBUG) << "Successfully connected to MySQL service " << this->name << " at " << this->server << ":" << this->port; } @@ -553,4 +553,3 @@ void DispatcherThread::Run() } MODULE_INIT(ModuleSQL) - diff --git a/modules/extra/m_regex_pcre.cpp b/modules/extra/m_regex_pcre.cpp index c2e9a1f10..bbb90a8b8 100644 --- a/modules/extra/m_regex_pcre.cpp +++ b/modules/extra/m_regex_pcre.cpp @@ -23,7 +23,7 @@ class PCRERegex : public Regex int erroffset; this->regex = pcre_compile(expr.c_str(), PCRE_CASELESS, &error, &erroffset, NULL); if (!this->regex) - throw RegexException("Error in regex " + expr + " at offset " + stringify(erroffset) + ": " + error); + throw RegexException("Error in regex " + expr + " at offset " + stringify(erroffset) + ": " + error); } ~PCRERegex() diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp index 35e25aac9..b444c1a6c 100644 --- a/modules/extra/m_sqlite.cpp +++ b/modules/extra/m_sqlite.cpp @@ -299,7 +299,7 @@ Query SQLiteService::BuildInsert(const Anope::string &table, unsigned int id, Da *it->second >> buf; query.SetValue(it->first, buf); } - + return query; } @@ -332,4 +332,3 @@ Anope::string SQLiteService::FromUnixtime(time_t t) } MODULE_INIT(ModuleSQLite) - diff --git a/modules/extra/m_ssl_openssl.cpp b/modules/extra/m_ssl_openssl.cpp index 65b06604e..391ab2f9f 100644 --- a/modules/extra/m_ssl_openssl.cpp +++ b/modules/extra/m_ssl_openssl.cpp @@ -205,7 +205,7 @@ void MySSLService::Init(Socket *s) { if (s->io != &NormalSocketIO) throw CoreException("Socket initializing SSL twice"); - + s->io = new SSLSocketIO(); } @@ -283,7 +283,7 @@ ClientSocket *SSLSocketIO::Accept(ListenSocket *s) newsocket->flags[SF_ACCEPTING] = true; this->FinishAccept(newsocket); - + return newsocket; } @@ -297,7 +297,7 @@ SocketFlag SSLSocketIO::FinishAccept(ClientSocket *cs) throw SocketException("SSLSocketIO::FinishAccept called for a socket not accepted nor accepting?"); SSLSocketIO *io = anope_dynamic_static_cast(cs->io); - + int ret = SSL_accept(io->sslsock); if (ret <= 0) { @@ -378,7 +378,7 @@ SocketFlag SSLSocketIO::FinishConnect(ConnectionSocket *s) if (!SSL_set_fd(io->sslsock, s->GetFD())) throw SocketException("Unable to set SSL fd"); } - + int ret = SSL_connect(io->sslsock); if (ret <= 0) { diff --git a/modules/extra/stats/cs_fantasy_stats.cpp b/modules/extra/stats/cs_fantasy_stats.cpp index 628d40747..d571c0c2b 100644 --- a/modules/extra/stats/cs_fantasy_stats.cpp +++ b/modules/extra/stats/cs_fantasy_stats.cpp @@ -174,4 +174,3 @@ void CommandCSGStats::Execute(CommandSource &source, const std::vectorDoTop(source, params, true, 10); } - MODULE_INIT(CSTop) diff --git a/modules/extra/stats/irc2sql/CMakeLists.txt b/modules/extra/stats/irc2sql/CMakeLists.txt index 9d36c6e8d..781f0ef1f 100644 --- a/modules/extra/stats/irc2sql/CMakeLists.txt +++ b/modules/extra/stats/irc2sql/CMakeLists.txt @@ -1,2 +1 @@ build_subdir(${CMAKE_CURRENT_SOURCE_DIR}) - diff --git a/modules/extra/stats/irc2sql/irc2sql.h b/modules/extra/stats/irc2sql/irc2sql.h index d18e89762..19b230200 100644 --- a/modules/extra/stats/irc2sql/irc2sql.h +++ b/modules/extra/stats/irc2sql/irc2sql.h @@ -82,5 +82,3 @@ class IRC2SQL : public Module void OnBotNotice(User *u, BotInfo *bi, Anope::string &message) anope_override; }; - - diff --git a/modules/extra/stats/irc2sql/utils.cpp b/modules/extra/stats/irc2sql/utils.cpp index 0b0fe787f..3a349ccfb 100644 --- a/modules/extra/stats/irc2sql/utils.cpp +++ b/modules/extra/stats/irc2sql/utils.cpp @@ -66,4 +66,3 @@ bool IRC2SQL::HasEvent(const Anope::string &table) return true; return false; } - diff --git a/modules/extra/stats/m_chanstats.cpp b/modules/extra/stats/m_chanstats.cpp index 08d654da4..40c8db5d1 100644 --- a/modules/extra/stats/m_chanstats.cpp +++ b/modules/extra/stats/m_chanstats.cpp @@ -111,7 +111,7 @@ class CommandNSSetChanstats : public Command { this->Run(source, source.nc->display, params[0]); } - + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); @@ -653,4 +653,3 @@ class MChanstats : public Module }; MODULE_INIT(MChanstats) - -- cgit