From 93a4f8178c26b0ae894d2060086f605fe22b0a3e Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 14 Jun 2019 14:24:03 +0100 Subject: Log SQL queries at the debug log level. This makes debugging issues easier. --- src/modules/extra/m_sqlite3.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/modules/extra/m_sqlite3.cpp') diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index e81e99025..7807a69f0 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -174,6 +174,7 @@ class SQLConn : public SQL::Provider void Submit(SQL::Query* query, const std::string& q) CXX11_OVERRIDE { + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Executing SQLite3 query: " + q); Query(query, q); delete query; } -- cgit v1.3.1-10-gc9f91 From 871d93dc76091a273296e9a0a7ce3d411054c862 Mon Sep 17 00:00:00 2001 From: linuxdaemon Date: Mon, 24 Jun 2019 06:00:39 -0500 Subject: Reset diagnostic pragmas after including external headers (#1661). --- src/modules/extra/m_ldap.cpp | 5 +++++ src/modules/extra/m_mysql.cpp | 7 +++++++ src/modules/extra/m_regex_re2.cpp | 8 ++++++++ src/modules/extra/m_sqlite3.cpp | 8 ++++++++ src/modules/extra/m_ssl_gnutls.cpp | 8 ++++++++ src/modules/extra/m_ssl_openssl.cpp | 8 ++++++++ src/modules/m_httpd.cpp | 10 +++++++++- src/modules/m_sha256.cpp | 7 +++++++ 8 files changed, 60 insertions(+), 1 deletion(-) (limited to 'src/modules/extra/m_sqlite3.cpp') diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 65b6b2b00..0eb2f7511 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -28,11 +28,16 @@ // Ignore OpenLDAP deprecation warnings on OS X Yosemite and newer. #if defined __APPLE__ +# pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif #include +#ifdef __APPLE__ +# pragma GCC diagnostic pop +#endif + #ifdef _WIN32 # pragma comment(lib, "libldap_r.lib") # pragma comment(lib, "liblber.lib") diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index d0ccebc47..02d2a08a9 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -28,6 +28,9 @@ /// $PackageInfo: require_system("debian") libmysqlclient-dev /// $PackageInfo: require_system("ubuntu") libmysqlclient-dev +#ifdef __GNUC__ +# pragma GCC diagnostic push +#endif // Fix warnings about the use of `long long` on C++03. #if defined __clang__ @@ -40,6 +43,10 @@ #include #include "modules/sql.h" +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + #ifdef _WIN32 # pragma comment(lib, "libmysql.lib") #endif diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp index 4bcf287ca..e5b27fcd5 100644 --- a/src/modules/extra/m_regex_re2.cpp +++ b/src/modules/extra/m_regex_re2.cpp @@ -28,6 +28,10 @@ #include "inspircd.h" #include "modules/regex.h" +#ifdef __GNUC__ +# pragma GCC diagnostic push +#endif + // Fix warnings about the use of `long long` on C++03 and // shadowing on GCC. #if defined __clang__ @@ -39,6 +43,10 @@ #include +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + class RE2Regex : public Regex { RE2 regexcl; diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 7807a69f0..47c5b01a4 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -30,6 +30,10 @@ #include "inspircd.h" #include "modules/sql.h" +#ifdef __GNUC__ +# pragma GCC diagnostic push +#endif + // Fix warnings about the use of `long long` on C++03. #if defined __clang__ # pragma clang diagnostic ignored "-Wc++11-long-long" @@ -39,6 +43,10 @@ #include +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + #ifdef _WIN32 # pragma comment(lib, "sqlite3.lib") #endif diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index ce1dbaeaf..5785b1ab4 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -37,6 +37,10 @@ #include "modules/ssl.h" #include +#ifdef __GNUC__ +# pragma GCC diagnostic push +#endif + // Fix warnings about the use of commas at end of enumerator lists on C++03. #if defined __clang__ # pragma clang diagnostic ignored "-Wc++11-extensions" @@ -54,6 +58,10 @@ #include #include +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + #ifndef GNUTLS_VERSION_NUMBER #define GNUTLS_VERSION_NUMBER LIBGNUTLS_VERSION_NUMBER #define GNUTLS_VERSION LIBGNUTLS_VERSION diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 4937e7cb0..8d6b1e98c 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -34,6 +34,10 @@ #include "iohook.h" #include "modules/ssl.h" +#ifdef __GNUC__ +# pragma GCC diagnostic push +#endif + // Ignore OpenSSL deprecation warnings on OS X Lion and newer. #if defined __APPLE__ # pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -50,6 +54,10 @@ #include #include +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + #ifdef _WIN32 # pragma comment(lib, "ssleay32.lib") # pragma comment(lib, "libeay32.lib") diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index c4b5dc1f2..b768789f1 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -28,6 +28,10 @@ #include "iohook.h" #include "modules/httpd.h" +#ifdef __GNUC__ +# pragma GCC diagnostic push +#endif + // Fix warnings about the use of commas at end of enumerator lists and long long // on C++03. #if defined __clang__ @@ -44,11 +48,15 @@ // Fix warnings about shadowing in http_parser. #ifdef __GNUC__ -//# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wshadow" #endif #include +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + class ModuleHttpServer; static ModuleHttpServer* HttpModule; diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp index e3ca22a2b..7afb9b3cf 100644 --- a/src/modules/m_sha256.cpp +++ b/src/modules/m_sha256.cpp @@ -22,6 +22,9 @@ /// $CompilerFlags: -Ivendor_directory("sha2") /// $CompilerFlags: require_compiler("GCC") -Wno-long-long +#ifdef __GNUC__ +# pragma GCC diagnostic push +#endif // Fix warnings about the use of `long long` on C++03. #if defined __clang__ @@ -35,6 +38,10 @@ #include +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + class HashSHA256 : public HashProvider { public: -- cgit v1.3.1-10-gc9f91 From 5385944ae931ee755dce57082089f4032a83e944 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Tue, 16 Jul 2019 11:52:17 +0100 Subject: Add package names for ArchLinux. --- src/modules/extra/m_geo_maxmind.cpp | 1 + src/modules/extra/m_ldap.cpp | 1 + src/modules/extra/m_mysql.cpp | 1 + src/modules/extra/m_pgsql.cpp | 1 + src/modules/extra/m_regex_pcre.cpp | 1 + src/modules/extra/m_regex_re2.cpp | 1 + src/modules/extra/m_regex_tre.cpp | 1 + src/modules/extra/m_sqlite3.cpp | 1 + src/modules/extra/m_ssl_gnutls.cpp | 1 + src/modules/extra/m_ssl_mbedtls.cpp | 1 + src/modules/extra/m_ssl_openssl.cpp | 1 + 11 files changed, 11 insertions(+) (limited to 'src/modules/extra/m_sqlite3.cpp') diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp index 6f84f31a3..767d00114 100644 --- a/src/modules/extra/m_geo_maxmind.cpp +++ b/src/modules/extra/m_geo_maxmind.cpp @@ -19,6 +19,7 @@ /// $CompilerFlags: find_compiler_flags("libmaxminddb" "") /// $LinkerFlags: find_linker_flags("libmaxminddb" "-lmaxminddb") +/// $PackageInfo: require_system("arch") libmaxminddb pkgconf /// $PackageInfo: require_system("darwin") libmaxminddb pkg-config /// $PackageInfo: require_system("debian" "9.0") libmaxminddb-dev pkg-config /// $PackageInfo: require_system("ubuntu" "16.04") libmaxminddb-dev pkg-config diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 0eb2f7511..37a19fb21 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -19,6 +19,7 @@ /// $LinkerFlags: -llber -lldap_r +/// $PackageInfo: require_system("arch") libldap /// $PackageInfo: require_system("centos") openldap-devel /// $PackageInfo: require_system("debian") libldap2-dev /// $PackageInfo: require_system("ubuntu") libldap2-dev diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 02d2a08a9..c50d2abf5 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -22,6 +22,7 @@ /// $CompilerFlags: execute("mysql_config --include" "MYSQL_CXXFLAGS") /// $LinkerFlags: execute("mysql_config --libs_r" "MYSQL_LDFLAGS" "-lmysqlclient") +/// $PackageInfo: require_system("arch") mariadb-libs /// $PackageInfo: require_system("centos" "6.0" "6.99") mysql-devel /// $PackageInfo: require_system("centos" "7.0") mariadb-devel /// $PackageInfo: require_system("darwin") mysql-connector-c diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 3484aeca2..5d059ec9c 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -24,6 +24,7 @@ /// $CompilerFlags: -Iexecute("pg_config --includedir" "POSTGRESQL_INCLUDE_DIR") /// $LinkerFlags: -Lexecute("pg_config --libdir" "POSTGRESQL_LIBRARY_DIR") -lpq +/// $PackageInfo: require_system("arch") postgresql-libs /// $PackageInfo: require_system("centos") postgresql-devel /// $PackageInfo: require_system("darwin") postgresql /// $PackageInfo: require_system("debian") libpq-dev diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp index 83b464b2c..e4e18680f 100644 --- a/src/modules/extra/m_regex_pcre.cpp +++ b/src/modules/extra/m_regex_pcre.cpp @@ -20,6 +20,7 @@ /// $CompilerFlags: execute("pcre-config --cflags" "PCRE_CXXFLAGS") /// $LinkerFlags: execute("pcre-config --libs" "PCRE_LDFLAGS" "-lpcre") +/// $PackageInfo: require_system("arch") pcre /// $PackageInfo: require_system("centos") pcre-devel /// $PackageInfo: require_system("darwin") pcre /// $PackageInfo: require_system("debian") libpcre3-dev diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp index e5b27fcd5..d26bd7950 100644 --- a/src/modules/extra/m_regex_re2.cpp +++ b/src/modules/extra/m_regex_re2.cpp @@ -20,6 +20,7 @@ /// $CompilerFlags: find_compiler_flags("re2" "") /// $LinkerFlags: find_linker_flags("re2" "-lre2") +/// $PackageInfo: require_system("arch") pkgconf re2 /// $PackageInfo: require_system("darwin") pkg-config re2 /// $PackageInfo: require_system("debian" "8.0") libre2-dev pkg-config /// $PackageInfo: require_system("ubuntu" "15.10") libre2-dev pkg-config diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp index aa3f1d41e..590e1c472 100644 --- a/src/modules/extra/m_regex_tre.cpp +++ b/src/modules/extra/m_regex_tre.cpp @@ -20,6 +20,7 @@ /// $CompilerFlags: find_compiler_flags("tre") /// $LinkerFlags: find_linker_flags("tre" "-ltre") +/// $PackageInfo: require_system("arch") pkgconf tre /// $PackageInfo: require_system("darwin") pkg-config tre /// $PackageInfo: require_system("debian") libtre-dev pkg-config /// $PackageInfo: require_system("ubuntu") libtre-dev pkg-config diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 47c5b01a4..8efdf876f 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -22,6 +22,7 @@ /// $CompilerFlags: find_compiler_flags("sqlite3") /// $LinkerFlags: find_linker_flags("sqlite3" "-lsqlite3") +/// $PackageInfo: require_system("arch") pkgconf sqlite /// $PackageInfo: require_system("centos") pkgconfig sqlite-devel /// $PackageInfo: require_system("darwin") pkg-config sqlite3 /// $PackageInfo: require_system("debian") libsqlite3-dev pkg-config diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 5785b1ab4..26c24ac70 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -26,6 +26,7 @@ /// $LinkerFlags: find_linker_flags("gnutls" "-lgnutls") /// $LinkerFlags: require_version("gnutls" "1.0" "2.12") execute("libgcrypt-config --libs" "LIBGCRYPT_LDFLAGS") +/// $PackageInfo: require_system("arch") gnutls pkgconf /// $PackageInfo: require_system("centos") gnutls-devel pkgconfig /// $PackageInfo: require_system("darwin") gnutls pkg-config /// $PackageInfo: require_system("debian" "1.0" "7.99") libgcrypt11-dev diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 75b25fbc4..c4c1906a1 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -18,6 +18,7 @@ /// $LinkerFlags: -lmbedtls +/// $PackageInfo: require_system("arch") mbedtls /// $PackageInfo: require_system("darwin") mbedtls /// $PackageInfo: require_system("debian" "9.0") libmbedtls-dev /// $PackageInfo: require_system("ubuntu" "16.04") libmbedtls-dev diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 8d6b1e98c..221a3076a 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -24,6 +24,7 @@ /// $CompilerFlags: find_compiler_flags("openssl") /// $LinkerFlags: find_linker_flags("openssl" "-lssl -lcrypto") +/// $PackageInfo: require_system("arch") openssl pkgconf /// $PackageInfo: require_system("centos") openssl-devel pkgconfig /// $PackageInfo: require_system("darwin") openssl pkg-config /// $PackageInfo: require_system("debian") libssl-dev openssl pkg-config -- cgit v1.3.1-10-gc9f91