diff options
| author |  Sadie Powell | 2021-05-11 03:53:43 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-05-11 04:07:45 +0100 |
| commit | 3ca912ad71cdc4004401e0977be73c674bb91fbc (patch) | |
| tree | cf57b43229becfc3d9c8532a2d4f18f095f024ec /src/modules/extra | |
| parent | Optimise building the link data string. (diff) | |
| parent | Send ERR_BADCHANMASK when trying to OJOIN/SAJOIN an invalid channel. (diff) | |
| download | inspircd++-3ca912ad71cdc4004401e0977be73c674bb91fbc.tar.gz inspircd++-3ca912ad71cdc4004401e0977be73c674bb91fbc.tar.bz2 inspircd++-3ca912ad71cdc4004401e0977be73c674bb91fbc.zip | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/extra')
| -rw-r--r-- | src/modules/extra/m_pgsql.cpp | 8 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 4 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_mbedtls.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 9f512a21a..b61b96b3c 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -185,11 +185,11 @@ class PgSQLresult : public SQL::Result class SQLConn : public SQL::Provider, public EventHandler { public: - std::shared_ptr<ConfigTag> conf; /* The <database> entry */ + std::shared_ptr<ConfigTag> conf; /* The <database> entry */ std::deque<QueueItem> queue; - PGconn* sql = nullptr; /* PgSQL database connection handle */ - SQLstatus status = CWRITE; /* PgSQL database connection status */ - QueueItem qinprog; /* If there is currently a query in progress */ + 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, std::shared_ptr<ConfigTag> tag) : SQL::Provider(Creator, tag->getString("id")) diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 55673ab3a..52003b675 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -37,7 +37,7 @@ /// $PackageInfo: require_system("centos") gnutls-devel pkgconfig /// $PackageInfo: require_system("darwin") gnutls pkg-config /// $PackageInfo: require_system("debian") gnutls-bin libgnutls28-dev pkg-config -/// $PackageInfo: require_system("ubuntu") gnutls-bin libgnutls-dev pkg-config +/// $PackageInfo: require_system("ubuntu") gnutls-bin libgnutls28-dev pkg-config #include "inspircd.h" #include "modules/ssl.h" @@ -1079,7 +1079,7 @@ class GnuTLSIOHookProvider : public SSLIOHookProvider GnuTLS::Profile profile; public: - GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config) + GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config) : SSLIOHookProvider(mod, config.name) , profile(config) { diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 8f3b34a2b..7b8313f90 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -810,7 +810,7 @@ class mbedTLSIOHookProvider : public SSLIOHookProvider mbedTLS::Profile profile; public: - mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config) + mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config) : SSLIOHookProvider(mod, config.name) , profile(config) { |