From 98e4ddfb21d285c8b675788c155bb204822fbd4a Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 6 Feb 2020 11:25:42 +0000 Subject: Use C++11 inline initialisation for class members. --- src/modules/extra/m_ldap.cpp | 12 +++++------- src/modules/extra/m_mysql.cpp | 19 ++++--------------- src/modules/extra/m_pgsql.cpp | 20 +++++++------------- src/modules/extra/m_sqlite3.cpp | 8 ++------ src/modules/extra/m_ssl_gnutls.cpp | 11 +++-------- src/modules/extra/m_ssl_openssl.cpp | 3 +-- 6 files changed, 22 insertions(+), 51 deletions(-) (limited to 'src/modules/extra') diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 6dfd575e9..46b76ab5f 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -54,16 +54,14 @@ class LDAPRequest public: LDAPService* service; LDAPInterface* inter; - LDAPMessage* message; /* message returned by ldap_ */ - LDAPResult* result; /* final result */ + LDAPMessage* message = nullptr; /* message returned by ldap_ */ + LDAPResult* result = nullptr; /* final result */ struct timeval tv; QueryType type; LDAPRequest(LDAPService* s, LDAPInterface* i) : service(s) , inter(i) - , message(NULL) - , result(NULL) { type = QUERY_UNKNOWN; tv.tv_sec = 0; @@ -183,9 +181,9 @@ class LDAPCompare : public LDAPRequest class LDAPService : public LDAPProvider, public SocketThread { - LDAP* con; + LDAP* con = nullptr; reference config; - time_t last_connect; + time_t last_connect = 0; int searchscope; time_t timeout; @@ -275,7 +273,7 @@ class LDAPService : public LDAPProvider, public SocketThread LDAPService(Module* c, ConfigTag* tag) : LDAPProvider(c, "LDAP/" + tag->getString("id")) - , con(NULL), config(tag), last_connect(0) + , config(tag) { std::string scope = config->getString("searchscope"); if (stdalgo::string::equalsci(scope, "base")) diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 179a6790b..f4207dcb2 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -133,12 +133,11 @@ typedef std::deque ResultQueue; class ModuleSQL : public Module { public: - DispatcherThread* Dispatcher; + DispatcherThread* Dispatcher = nullptr; QueryQueue qq; // MUST HOLD MUTEX ResultQueue rq; // MUST HOLD MUTEX ConnMap connections; // main thread only - ModuleSQL(); void init() override; ~ModuleSQL(); void ReadConfig(ConfigStatus& status) override; @@ -163,15 +162,13 @@ class MySQLresult : public SQL::Result { public: SQL::Error err; - int currentrow; - int rows; + int currentrow = 0; + int rows = 0; std::vector colnames; std::vector fieldlists; MySQLresult(MYSQL_RES* res, int affected_rows) : err(SQL::SUCCESS) - , currentrow(0) - , rows(0) { if (affected_rows >= 1) { @@ -216,8 +213,6 @@ class MySQLresult : public SQL::Result MySQLresult(SQL::Error& e) : err(e) - , currentrow(0) - , rows(0) { } @@ -301,14 +296,13 @@ class SQLConnection : public SQL::Provider public: reference config; - MYSQL *connection; + MYSQL* connection = nullptr; std::mutex lock; // This constructor creates an SQLConnection object with the given credentials, but does not connect yet. SQLConnection(Module* p, ConfigTag* tag) : SQL::Provider(p, tag->getString("id")) , config(tag) - , connection(NULL) { } @@ -439,11 +433,6 @@ class SQLConnection : public SQL::Provider } }; -ModuleSQL::ModuleSQL() - : Dispatcher(NULL) -{ -} - void ModuleSQL::init() { if (mysql_library_init(0, NULL, NULL)) diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 567c2b30f..8702ab8a4 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -92,8 +92,8 @@ struct QueueItem class PgSQLresult : public SQL::Result { PGresult* res; - int currentrow; - int rows; + int currentrow = 0; + int rows = 0; std::vector colnames; void getColNames() @@ -105,7 +105,8 @@ class PgSQLresult : public SQL::Result } } public: - PgSQLresult(PGresult* result) : res(result), currentrow(0) + PgSQLresult(PGresult* result) + : res(result) { rows = PQntuples(res); if (!rows) @@ -177,15 +178,13 @@ class SQLConn : public SQL::Provider, public EventHandler public: reference conf; /* The entry */ std::deque queue; - PGconn* sql; /* PgSQL database connection handle */ - SQLstatus status; /* PgSQL database connection status */ + PGconn* sql = nullptr; /* PgSQL database connection handle */ + SQLstatus status = CWRITE; /* PgSQL database connection status */ QueueItem qinprog; /* If there is currently a query in progress */ SQLConn(Module* Creator, ConfigTag* tag) : SQL::Provider(Creator, tag->getString("id")) , conf(tag) - , sql(NULL) - , status(CWRITE) , qinprog(NULL, "") { if (!DoConnect()) @@ -536,12 +535,7 @@ class ModulePgSQL : public Module { public: ConnMap connections; - ReconnectTimer* retimer; - - ModulePgSQL() - : retimer(NULL) - { - } + ReconnectTimer* retimer = nullptr; ~ModulePgSQL() { diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index e60217dff..1b315df27 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -49,15 +49,11 @@ typedef insp::flat_map ConnMap; class SQLite3Result : public SQL::Result { public: - int currentrow; - int rows; + int currentrow = 0; + int rows = 0; std::vector columns; std::vector fieldlists; - SQLite3Result() : currentrow(0), rows(0) - { - } - int Rows() override { return rows; diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 1c193df6a..42192325c 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -611,10 +611,10 @@ namespace GnuTLS class GnuTLSIOHook : public SSLIOHook { private: - gnutls_session_t sess; - issl_status status; + gnutls_session_t sess = nullptr; + issl_status status = ISSL_NONE; #ifdef INSPIRCD_GNUTLS_HAS_CORK - size_t gbuffersize; + size_t gbuffersize = 0; #endif void CloseSession() @@ -909,11 +909,6 @@ info_done_dealloc: public: GnuTLSIOHook(IOHookProvider* hookprov, StreamSocket* sock, unsigned int flags) : SSLIOHook(hookprov) - , sess(NULL) - , status(ISSL_NONE) -#ifdef INSPIRCD_GNUTLS_HAS_CORK - , gbuffersize(0) -#endif { gnutls_init(&sess, flags); gnutls_transport_set_ptr(sess, reinterpret_cast(sock)); diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 5cbdb9dcf..b7916b857 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -480,7 +480,7 @@ class OpenSSLIOHook : public SSLIOHook private: SSL* sess; issl_status status; - bool data_to_write; + bool data_to_write = false; // Returns 1 if handshake succeeded, 0 if it is still in progress, -1 if it failed int Handshake(StreamSocket* user) @@ -647,7 +647,6 @@ class OpenSSLIOHook : public SSLIOHook : SSLIOHook(hookprov) , sess(session) , status(ISSL_NONE) - , data_to_write(false) { // Create BIO instance and store a pointer to the socket in it which will be used by the read and write functions BIO* bio = BIO_new(biomethods); -- cgit v1.3.1-10-gc9f91