From e41589be104dc33e56efbe9dc79633b2bc387039 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 13 Oct 2016 15:20:51 +0300 Subject: [PATCH] Move headers from server/include to include/maxscale - Headers now to be included as - First step, no cleanup of headers has been made. Only moving from one place to another + necessary modifications. --- CMakeLists.txt | 12 +++--- avro/maxavro.c | 2 +- avro/maxavro.h | 2 +- avro/maxavro_file.c | 2 +- avro/maxavro_record.c | 6 +-- avro/maxavro_schema.c | 4 +- avro/maxavro_write.c | 2 +- avro/maxavrocheck.c | 2 +- client/maxadmin.c | 2 +- .../maxscale}/adminusers.h.in | 2 +- {server/include => include}/maxscale/alloc.h | 2 +- {server/include => include/maxscale}/atomic.h | 0 {server/include => include/maxscale}/buffer.h | 6 +-- .../include => include/maxscale}/dbusers.h | 2 +- {server/include => include/maxscale}/dcb.h | 18 ++++----- .../maxscale}/def_monitor_event.h | 0 .../include => include/maxscale}/externcmd.h | 6 +-- {server/include => include/maxscale}/filter.h | 6 +-- {server/include => include/maxscale}/gw.h | 2 +- .../maxscale}/gw_authenticator.h | 2 +- .../maxscale}/gw_protocol.h | 2 +- {server/include => include/maxscale}/gw_ssl.h | 2 +- .../include => include/maxscale}/gwbitmask.h | 2 +- .../include => include/maxscale}/gwdirs.h.in | 2 +- .../include => include/maxscale}/hashtable.h | 4 +- {server/include => include/maxscale}/hint.h | 2 +- .../maxscale}/hk_heartbeat.h | 0 .../maxscale}/housekeeper.h | 4 +- {server/include => include}/maxscale/limits.h | 0 .../include => include/maxscale}/listener.h | 6 +-- .../maxscale}/listmanager.h | 4 +- .../maxscale}/log_manager.h | 0 .../include => include/maxscale}/maxconfig.h | 4 +- .../include => include/maxscale}/maxscale.h | 0 .../maxscale}/maxscale_pcre2.h | 0 {server/include => include/maxscale}/memlog.h | 2 +- {server/include => include/maxscale}/mlist.h | 2 +- .../include => include/maxscale}/modinfo.h | 0 .../include => include/maxscale}/modules.h | 8 ++-- .../include => include/maxscale}/modutil.h | 6 +-- .../include => include/maxscale}/monitor.h | 14 +++---- .../maxscale}/mysql_binlog.h | 0 .../maxscale}/mysql_utils.h | 2 +- .../maxscale}/notification.h | 0 .../include => include/maxscale}/platform.h | 0 {server/include => include}/maxscale/poll.h | 6 +-- .../maxscale}/query_classifier.h | 4 +- .../maxscale}/queuemanager.h | 2 +- .../maxscale}/random_jkiss.h | 0 {server/include => include/maxscale}/rdtsc.h | 0 .../include => include/maxscale}/resultset.h | 2 +- {server/include => include/maxscale}/router.h | 6 +-- .../include => include/maxscale}/secrets.h | 0 {server/include => include/maxscale}/server.h | 4 +- .../include => include/maxscale}/service.h | 20 +++++----- .../include => include/maxscale}/session.h | 14 +++---- .../maxscale}/skygw_debug.h | 2 +- .../maxscale}/skygw_types.h | 0 .../maxscale}/skygw_utils.h | 4 +- {server/include => include/maxscale}/slist.h | 2 +- .../include => include/maxscale}/spinlock.h | 2 +- .../include => include/maxscale}/statistics.h | 0 .../include => include/maxscale}/test_utils.h | 10 ++--- {server/include => include/maxscale}/thread.h | 0 {server/include => include/maxscale}/users.h | 6 +-- {server/include => include/maxscale}/utils.h | 0 .../include => include/maxscale}/version.h.in | 0 query_classifier/qc_dummy/qc_dummy.cc | 4 +- .../qc_mysqlembedded/qc_mysqlembedded.cc | 10 ++--- .../qc_sqlite/builtin_functions.c | 2 +- query_classifier/qc_sqlite/qc_sqlite.c | 12 +++--- .../test/canonical_tests/canonizer.c | 6 +-- query_classifier/test/classify.c | 8 ++-- query_classifier/test/compare.cc | 6 +-- server/core/adminusers.c | 10 ++--- server/core/alloc.c | 2 +- server/core/authenticator.c | 6 +-- server/core/buffer.c | 16 ++++---- server/core/config.c | 28 ++++++------- server/core/dbusers.c | 16 ++++---- server/core/dcb.c | 30 +++++++------- server/core/externcmd.c | 2 +- server/core/filter.c | 12 +++--- server/core/gateway.c | 36 ++++++++--------- server/core/gw_ssl.c | 6 +-- server/core/gw_utils.c | 10 ++--- server/core/gwbitmask.c | 2 +- server/core/gwdirs.c | 4 +- server/core/hashtable.c | 4 +- server/core/hint.c | 2 +- server/core/housekeeper.c | 8 ++-- server/core/listener.c | 12 +++--- server/core/listmanager.c | 8 ++-- server/core/load_utils.c | 16 ++++---- server/core/log_manager.cc | 16 ++++---- server/core/maxkeys.c | 8 ++-- server/core/maxpasswd.c | 8 ++-- server/core/maxscale_pcre2.c | 2 +- server/core/memlog.c | 4 +- server/core/misc.c | 2 +- server/core/mlist.c | 2 +- server/core/modutil.c | 4 +- server/core/monitor.c | 20 +++++----- server/core/mysql_binlog.c | 12 +++--- server/core/mysql_utils.c | 8 ++-- server/core/poll.c | 26 ++++++------ server/core/query_classifier.c | 8 ++-- server/core/queuemanager.c | 10 ++--- server/core/random_jkiss.c | 4 +- server/core/resultset.c | 6 +-- server/core/secrets.c | 12 +++--- server/core/server.c | 16 ++++---- server/core/service.c | 40 +++++++++---------- server/core/session.c | 20 +++++----- server/core/skygw_utils.cc | 10 ++--- server/core/slist.c | 4 +- server/core/spinlock.c | 6 +-- server/core/statistics.c | 6 +-- server/core/test/test_mysql_users.c | 16 ++++---- server/core/test/testadminusers.c | 4 +- server/core/test/testbuffer.c | 4 +- server/core/test/testdcb.c | 4 +- server/core/test/testfeedback.c | 10 ++--- server/core/test/testfilter.c | 2 +- server/core/test/testgwbitmask.c | 4 +- server/core/test/testhash.c | 4 +- server/core/test/testhint.c | 2 +- server/core/test/testlog.c | 4 +- server/core/test/testlogorder.c | 4 +- server/core/test/testlogthrottling.cc | 2 +- server/core/test/testmaxscalepcre2.c | 4 +- server/core/test/testmemlog.c | 2 +- server/core/test/testmodutil.c | 4 +- server/core/test/testpoll.c | 6 +-- server/core/test/testqueuemanager.c | 8 ++-- server/core/test/testserver.c | 4 +- server/core/test/testservice.c | 8 ++-- server/core/test/testspinlock.c | 4 +- server/core/test/testusers.c | 4 +- server/core/thread.c | 2 +- server/core/users.c | 6 +-- server/core/utils.c | 14 +++---- server/modules/authenticator/cdc_plain_auth.c | 6 +-- server/modules/authenticator/gssapi_auth.c | 4 +- .../authenticator/gssapi_backend_auth.c | 4 +- server/modules/authenticator/http_auth.c | 14 +++---- server/modules/authenticator/max_admin_auth.c | 12 +++--- server/modules/authenticator/mysql_auth.c | 12 +++--- .../authenticator/mysql_backend_auth.c | 4 +- .../modules/authenticator/null_auth_allow.c | 10 ++--- server/modules/authenticator/null_auth_deny.c | 10 ++--- server/modules/filter/cache/cache.c | 14 +++---- .../modules/filter/cache/cache_storage_api.h | 4 +- server/modules/filter/cache/rules.c | 6 +-- server/modules/filter/cache/rules.h | 6 +-- server/modules/filter/cache/storage.c | 4 +- .../storage/storage_rocksdb/rocksdbstorage.cc | 6 +-- .../storage/storage_rocksdb/storage_rocksdb.h | 2 +- server/modules/filter/cache/test/testrules.c | 4 +- server/modules/filter/ccrfilter/ccrfilter.c | 14 +++---- server/modules/filter/dbfwfilter/dbfwfilter.c | 18 ++++----- server/modules/filter/dbfwfilter/ruleparser.y | 4 +- server/modules/filter/gatekeeper/gatekeeper.c | 14 +++---- server/modules/filter/hintfilter/hintfilter.c | 6 +-- server/modules/filter/hintfilter/hintparser.c | 10 ++--- server/modules/filter/luafilter/luafilter.c | 16 ++++---- server/modules/filter/mqfilter/mqfilter.c | 18 ++++----- .../namedserverfilter/namedserverfilter.c | 12 +++--- server/modules/filter/qlafilter/qlafilter.c | 12 +++--- .../modules/filter/regexfilter/regexfilter.c | 14 +++---- server/modules/filter/tee/tee.c | 20 +++++----- server/modules/filter/testfilter/testfilter.c | 8 ++-- server/modules/filter/topfilter/topfilter.c | 12 +++--- server/modules/filter/tpmfilter/tpmfilter.c | 12 +++--- server/modules/include/avrorouter.h | 16 ++++---- server/modules/include/blr.h | 8 ++-- server/modules/include/cdc.h | 16 ++++---- server/modules/include/debugcli.h | 6 +-- server/modules/include/httpd.h | 14 +++---- server/modules/include/maxinfo.h | 6 +-- server/modules/include/maxscaled.h | 6 +-- server/modules/include/mysql_auth.h | 4 +- .../include/mysql_client_server_protocol.h | 14 +++---- server/modules/include/mysqlhint.h | 2 +- server/modules/include/readconnection.h | 2 +- server/modules/include/readwritesplit.h | 4 +- server/modules/include/rwsplit_internal.h | 2 +- server/modules/include/schemarouter.h | 4 +- server/modules/include/sharding_common.h | 10 ++--- server/modules/include/telnetd.h | 4 +- server/modules/monitor/auroramon/auroramon.c | 8 ++-- server/modules/monitor/galeramon/galeramon.c | 2 +- server/modules/monitor/galeramon/galeramon.h | 20 +++++----- server/modules/monitor/mmmon/mmmon.c | 2 +- server/modules/monitor/mmmon/mmmon.h | 20 +++++----- server/modules/monitor/mysqlmon.h | 22 +++++----- server/modules/monitor/mysqlmon/mysql_mon.c | 4 +- server/modules/protocol/CDC/cdc.c | 10 ++--- server/modules/protocol/HTTPD/httpd.c | 10 ++--- .../MySQL/MySQLBackend/mysql_backend.c | 18 ++++----- .../protocol/MySQL/MySQLClient/mysql_client.c | 16 ++++---- server/modules/protocol/MySQL/mysql_common.c | 12 +++--- server/modules/protocol/maxscaled/maxscaled.c | 24 +++++------ server/modules/protocol/telnetd/telnetd.c | 24 +++++------ .../protocol/testprotocol/testprotocol.c | 8 ++-- server/modules/routing/avro/avro.c | 24 +++++------ server/modules/routing/avro/avro_client.c | 24 +++++------ server/modules/routing/avro/avro_file.c | 4 +- server/modules/routing/avro/avro_index.c | 2 +- server/modules/routing/avro/avro_rbr.c | 2 +- server/modules/routing/avro/avro_schema.c | 8 ++-- server/modules/routing/binlog/binlog_common.c | 2 +- server/modules/routing/binlog/blr.c | 28 ++++++------- server/modules/routing/binlog/blr_cache.c | 20 +++++----- server/modules/routing/binlog/blr_file.c | 22 +++++----- server/modules/routing/binlog/blr_master.c | 28 ++++++------- server/modules/routing/binlog/blr_slave.c | 28 ++++++------- .../modules/routing/binlog/maxbinlogcheck.c | 2 +- .../modules/routing/binlog/test/testbinlog.c | 26 ++++++------ server/modules/routing/cli/cli.c | 20 +++++----- server/modules/routing/debugcli/debugcli.c | 20 +++++----- server/modules/routing/debugcli/debugcmd.c | 38 +++++++++--------- server/modules/routing/maxinfo/maxinfo.c | 40 +++++++++---------- .../modules/routing/maxinfo/maxinfo_error.c | 22 +++++----- server/modules/routing/maxinfo/maxinfo_exec.c | 32 +++++++-------- .../modules/routing/maxinfo/maxinfo_parse.c | 22 +++++----- .../routing/readconnroute/readconnroute.c | 24 +++++------ .../routing/readwritesplit/readwritesplit.c | 16 ++++---- .../routing/readwritesplit/rwsplit_mysql.c | 16 ++++---- .../readwritesplit/rwsplit_route_stmt.c | 2 +- .../readwritesplit/rwsplit_select_backends.c | 2 +- .../readwritesplit/rwsplit_session_cmd.c | 2 +- .../readwritesplit/rwsplit_tmp_table_multi.c | 4 +- .../routing/schemarouter/schemarouter.c | 18 ++++----- server/modules/routing/testroute/testroute.c | 4 +- 235 files changed, 1010 insertions(+), 1010 deletions(-) rename {server/include => include/maxscale}/adminusers.h.in (98%) rename {server/include => include}/maxscale/alloc.h (98%) rename {server/include => include/maxscale}/atomic.h (100%) rename {server/include => include/maxscale}/buffer.h (98%) rename {server/include => include/maxscale}/dbusers.h (98%) rename {server/include => include/maxscale}/dcb.h (98%) rename {server/include => include/maxscale}/def_monitor_event.h (100%) rename {server/include => include/maxscale}/externcmd.h (91%) rename {server/include => include/maxscale}/filter.h (98%) rename {server/include => include/maxscale}/gw.h (98%) rename {server/include => include/maxscale}/gw_authenticator.h (99%) rename {server/include => include/maxscale}/gw_protocol.h (98%) rename {server/include => include/maxscale}/gw_ssl.h (98%) rename {server/include => include/maxscale}/gwbitmask.h (98%) rename {server/include => include/maxscale}/gwdirs.h.in (98%) rename {server/include => include/maxscale}/hashtable.h (98%) rename {server/include => include/maxscale}/hint.h (98%) rename {server/include => include/maxscale}/hk_heartbeat.h (100%) rename {server/include => include/maxscale}/housekeeper.h (96%) rename {server/include => include}/maxscale/limits.h (100%) rename {server/include => include/maxscale}/listener.h (96%) rename {server/include => include/maxscale}/listmanager.h (98%) rename {server/include => include/maxscale}/log_manager.h (100%) rename {server/include => include/maxscale}/maxconfig.h (99%) rename {server/include => include/maxscale}/maxscale.h (100%) rename {server/include => include/maxscale}/maxscale_pcre2.h (100%) rename {server/include => include/maxscale}/memlog.h (97%) rename {server/include => include/maxscale}/mlist.h (98%) rename {server/include => include/maxscale}/modinfo.h (100%) rename {server/include => include/maxscale}/modules.h (95%) rename {server/include => include/maxscale}/modutil.h (97%) rename {server/include => include/maxscale}/monitor.h (97%) rename {server/include => include/maxscale}/mysql_binlog.h (100%) rename {server/include => include/maxscale}/mysql_utils.h (96%) rename {server/include => include/maxscale}/notification.h (100%) rename {server/include => include/maxscale}/platform.h (100%) rename {server/include => include}/maxscale/poll.h (95%) rename {server/include => include/maxscale}/query_classifier.h (98%) rename {server/include => include/maxscale}/queuemanager.h (98%) rename {server/include => include/maxscale}/random_jkiss.h (100%) rename {server/include => include/maxscale}/rdtsc.h (100%) rename {server/include => include/maxscale}/resultset.h (98%) rename {server/include => include/maxscale}/router.h (97%) rename {server/include => include/maxscale}/secrets.h (100%) rename {server/include => include/maxscale}/server.h (99%) rename {server/include => include/maxscale}/service.h (96%) rename {server/include => include/maxscale}/session.h (96%) rename {server/include => include/maxscale}/skygw_debug.h (99%) rename {server/include => include/maxscale}/skygw_types.h (100%) rename {server/include => include/maxscale}/skygw_utils.h (98%) rename {server/include => include/maxscale}/slist.h (98%) rename {server/include => include/maxscale}/spinlock.h (98%) rename {server/include => include/maxscale}/statistics.h (100%) rename {server/include => include/maxscale}/test_utils.h (80%) rename {server/include => include/maxscale}/thread.h (100%) rename {server/include => include/maxscale}/users.h (96%) rename {server/include => include/maxscale}/utils.h (100%) rename {server/include => include/maxscale}/version.h.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ae651b70..745459863 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,10 +113,10 @@ if(${MAXSCALE_VERSION} MATCHES "-stable") endif() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/server/include) -configure_file(${CMAKE_SOURCE_DIR}/server/include/version.h.in ${CMAKE_BINARY_DIR}/server/include/version.h @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/server/include/gwdirs.h.in ${CMAKE_BINARY_DIR}/server/include/gwdirs.h @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/server/include/adminusers.h.in ${CMAKE_BINARY_DIR}/server/include/adminusers.h @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.h.in ${CMAKE_BINARY_DIR}/server/include/maxscale_test.h @ONLY) +configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/version.h.in ${CMAKE_BINARY_DIR}/include/maxscale/version.h @ONLY) +configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/gwdirs.h.in ${CMAKE_BINARY_DIR}/include/maxscale/gwdirs.h @ONLY) +configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/adminusers.h.in ${CMAKE_BINARY_DIR}/include/maxscale/adminusers.h @ONLY) +configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.h.in ${CMAKE_BINARY_DIR}/include/maxscale/maxscale_test.h @ONLY) configure_file(${CMAKE_SOURCE_DIR}/etc/postinst.in ${CMAKE_BINARY_DIR}/postinst @ONLY) configure_file(${CMAKE_SOURCE_DIR}/etc/postrm.in ${CMAKE_BINARY_DIR}/postrm @ONLY) configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.cnf ${CMAKE_BINARY_DIR}/maxscale.cnf @ONLY) @@ -177,10 +177,10 @@ set(CMAKE_CXX_FLAGS_RELEASE "") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-ggdb") include_directories(avro) -include_directories(server/include) +include_directories(include) include_directories(server/inih) include_directories(server/modules/include) -include_directories(${CMAKE_BINARY_DIR}/server/include) +include_directories(${CMAKE_BINARY_DIR}/include) include_directories(${CURL_INCLUDE_DIRS}) if (BUILD_AVRO) diff --git a/avro/maxavro.c b/avro/maxavro.c index 251257fbb..5809d4c18 100644 --- a/avro/maxavro.c +++ b/avro/maxavro.c @@ -15,7 +15,7 @@ #include #include #include "maxavro.h" -#include +#include #include /** Maximum byte size of an integer value */ diff --git a/avro/maxavro.h b/avro/maxavro.h index 715eb1ee5..4d337835f 100644 --- a/avro/maxavro.h +++ b/avro/maxavro.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include /** File magic and sync marker sizes block sizes */ #define AVRO_MAGIC_SIZE 4 diff --git a/avro/maxavro_file.c b/avro/maxavro_file.c index 457664333..efd91e2cf 100644 --- a/avro/maxavro_file.c +++ b/avro/maxavro_file.c @@ -14,7 +14,7 @@ #include "maxavro.h" #include #include -#include +#include static bool maxavro_read_sync(FILE *file, uint8_t* sync) diff --git a/avro/maxavro_record.c b/avro/maxavro_record.c index a5e0e06f9..961bc2add 100644 --- a/avro/maxavro_record.c +++ b/avro/maxavro_record.c @@ -12,10 +12,10 @@ */ #include "maxavro.h" -#include "skygw_utils.h" +#include #include -#include -#include +#include +#include #include bool maxavro_read_datablock_start(MAXAVRO_FILE *file); diff --git a/avro/maxavro_schema.c b/avro/maxavro_schema.c index 56c877b9b..e133b03c5 100644 --- a/avro/maxavro_schema.c +++ b/avro/maxavro_schema.c @@ -14,8 +14,8 @@ #include "maxavro.h" #include #include -#include -#include +#include +#include static const MAXAVRO_SCHEMA_FIELD types[MAXAVRO_TYPE_MAX] = { diff --git a/avro/maxavro_write.c b/avro/maxavro_write.c index 389fb06d7..cf4df1ce9 100644 --- a/avro/maxavro_write.c +++ b/avro/maxavro_write.c @@ -15,7 +15,7 @@ #include #include #include "maxavro.h" -#include +#include #include /** diff --git a/avro/maxavrocheck.c b/avro/maxavrocheck.c index b3c639720..23655be56 100644 --- a/avro/maxavrocheck.c +++ b/avro/maxavrocheck.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include static int verbose = 0; static uint64_t seekto = 0; diff --git a/client/maxadmin.c b/client/maxadmin.c index 2079b62bf..32b1a6b3f 100644 --- a/client/maxadmin.c +++ b/client/maxadmin.c @@ -48,7 +48,7 @@ #include #include -#include +#include #ifdef HISTORY #include diff --git a/server/include/adminusers.h.in b/include/maxscale/adminusers.h.in similarity index 98% rename from server/include/adminusers.h.in rename to include/maxscale/adminusers.h.in index 6817b8e8a..25e6acbe2 100644 --- a/server/include/adminusers.h.in +++ b/include/maxscale/adminusers.h.in @@ -24,7 +24,7 @@ * * @endverbatim */ -#include +#include #define ADMIN_SALT "$1$MXS" diff --git a/server/include/maxscale/alloc.h b/include/maxscale/alloc.h similarity index 98% rename from server/include/maxscale/alloc.h rename to include/maxscale/alloc.h index 5a87268ef..e138d3af3 100644 --- a/server/include/maxscale/alloc.h +++ b/include/maxscale/alloc.h @@ -15,7 +15,7 @@ #include #include -#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/atomic.h b/include/maxscale/atomic.h similarity index 100% rename from server/include/atomic.h rename to include/maxscale/atomic.h diff --git a/server/include/buffer.h b/include/maxscale/buffer.h similarity index 98% rename from server/include/buffer.h rename to include/maxscale/buffer.h index f3ae40134..935652671 100644 --- a/server/include/buffer.h +++ b/include/maxscale/buffer.h @@ -43,9 +43,9 @@ * @endverbatim */ #include -#include -#include -#include +#include +#include +#include #include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/dbusers.h b/include/maxscale/dbusers.h similarity index 98% rename from server/include/dbusers.h rename to include/maxscale/dbusers.h index 7062c20af..ea669b4df 100644 --- a/server/include/dbusers.h +++ b/include/maxscale/dbusers.h @@ -13,7 +13,7 @@ * Public License. */ -#include +#include #include diff --git a/server/include/dcb.h b/include/maxscale/dcb.h similarity index 98% rename from server/include/dcb.h rename to include/maxscale/dcb.h index 679ebb4cf..3a6020003 100644 --- a/server/include/dcb.h +++ b/include/maxscale/dcb.h @@ -12,15 +12,15 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define ERRHANDLE diff --git a/server/include/def_monitor_event.h b/include/maxscale/def_monitor_event.h similarity index 100% rename from server/include/def_monitor_event.h rename to include/maxscale/def_monitor_event.h diff --git a/server/include/externcmd.h b/include/maxscale/externcmd.h similarity index 91% rename from server/include/externcmd.h rename to include/maxscale/externcmd.h index f6e2d1568..ab4ed2460 100644 --- a/server/include/externcmd.h +++ b/include/maxscale/externcmd.h @@ -16,9 +16,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #define MAXSCALE_EXTCMD_ARG_MAX 256 diff --git a/server/include/filter.h b/include/maxscale/filter.h similarity index 98% rename from server/include/filter.h rename to include/maxscale/filter.h index fc6f7f257..3ccb8ac4c 100644 --- a/server/include/filter.h +++ b/include/maxscale/filter.h @@ -22,9 +22,9 @@ * 27/05/2014 Mark Riddoch Initial implementation * */ -#include -#include -#include +#include +#include +#include #include /** diff --git a/server/include/gw.h b/include/maxscale/gw.h similarity index 98% rename from server/include/gw.h rename to include/maxscale/gw.h index 616327563..17b011a28 100644 --- a/server/include/gw.h +++ b/include/maxscale/gw.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #define EXIT_FAILURE 1 diff --git a/server/include/gw_authenticator.h b/include/maxscale/gw_authenticator.h similarity index 99% rename from server/include/gw_authenticator.h rename to include/maxscale/gw_authenticator.h index 29a06ae40..5e999fb02 100644 --- a/server/include/gw_authenticator.h +++ b/include/maxscale/gw_authenticator.h @@ -27,7 +27,7 @@ * @endverbatim */ -#include +#include #include #include #include diff --git a/server/include/gw_protocol.h b/include/maxscale/gw_protocol.h similarity index 98% rename from server/include/gw_protocol.h rename to include/maxscale/gw_protocol.h index 7022d64a8..e2a3295da 100644 --- a/server/include/gw_protocol.h +++ b/include/maxscale/gw_protocol.h @@ -28,7 +28,7 @@ * @endverbatim */ -#include +#include struct dcb; struct server; diff --git a/server/include/gw_ssl.h b/include/maxscale/gw_ssl.h similarity index 98% rename from server/include/gw_ssl.h rename to include/maxscale/gw_ssl.h index 196f20a45..bfcc387cf 100644 --- a/server/include/gw_ssl.h +++ b/include/maxscale/gw_ssl.h @@ -27,7 +27,7 @@ * @endverbatim */ -#include +#include #include #include #include diff --git a/server/include/gwbitmask.h b/include/maxscale/gwbitmask.h similarity index 98% rename from server/include/gwbitmask.h rename to include/maxscale/gwbitmask.h index 782798907..31ee13655 100644 --- a/server/include/gwbitmask.h +++ b/include/maxscale/gwbitmask.h @@ -13,7 +13,7 @@ * Public License. */ -#include +#include #include /** diff --git a/server/include/gwdirs.h.in b/include/maxscale/gwdirs.h.in similarity index 98% rename from server/include/gwdirs.h.in rename to include/maxscale/gwdirs.h.in index 09824dac4..14592698c 100644 --- a/server/include/gwdirs.h.in +++ b/include/maxscale/gwdirs.h.in @@ -17,7 +17,7 @@ #endif #include #include -#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/hashtable.h b/include/maxscale/hashtable.h similarity index 98% rename from server/include/hashtable.h rename to include/maxscale/hashtable.h index f6f2ab22e..0b271d731 100644 --- a/server/include/hashtable.h +++ b/include/maxscale/hashtable.h @@ -28,8 +28,8 @@ * * @endverbatim */ -#include -#include +#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/hint.h b/include/maxscale/hint.h similarity index 98% rename from server/include/hint.h rename to include/maxscale/hint.h index 3f849d361..ea073292f 100644 --- a/server/include/hint.h +++ b/include/maxscale/hint.h @@ -25,7 +25,7 @@ * @endverbatim */ -#include +#include /** diff --git a/server/include/hk_heartbeat.h b/include/maxscale/hk_heartbeat.h similarity index 100% rename from server/include/hk_heartbeat.h rename to include/maxscale/hk_heartbeat.h diff --git a/server/include/housekeeper.h b/include/maxscale/housekeeper.h similarity index 96% rename from server/include/housekeeper.h rename to include/maxscale/housekeeper.h index 1cc6efd2e..6f0bea8db 100644 --- a/server/include/housekeeper.h +++ b/include/maxscale/housekeeper.h @@ -13,8 +13,8 @@ * Public License. */ #include -#include -#include +#include +#include /** * @file housekeeper.h A mechanism to have task run periodically * diff --git a/server/include/maxscale/limits.h b/include/maxscale/limits.h similarity index 100% rename from server/include/maxscale/limits.h rename to include/maxscale/limits.h diff --git a/server/include/listener.h b/include/maxscale/listener.h similarity index 96% rename from server/include/listener.h rename to include/maxscale/listener.h index 7e1c9c187..b2a2dbde5 100644 --- a/server/include/listener.h +++ b/include/maxscale/listener.h @@ -27,9 +27,9 @@ * @endverbatim */ -#include -#include -#include +#include +#include +#include struct dcb; struct service; diff --git a/server/include/listmanager.h b/include/maxscale/listmanager.h similarity index 98% rename from server/include/listmanager.h rename to include/maxscale/listmanager.h index a0ff8ff02..5afd28375 100644 --- a/server/include/listmanager.h +++ b/include/maxscale/listmanager.h @@ -26,8 +26,8 @@ * @endverbatim */ -#include -#include +#include +#include struct dcb; diff --git a/server/include/log_manager.h b/include/maxscale/log_manager.h similarity index 100% rename from server/include/log_manager.h rename to include/maxscale/log_manager.h diff --git a/server/include/maxconfig.h b/include/maxscale/maxconfig.h similarity index 99% rename from server/include/maxconfig.h rename to include/maxscale/maxconfig.h index 684af2376..2bf3c650b 100644 --- a/server/include/maxconfig.h +++ b/include/maxscale/maxconfig.h @@ -12,11 +12,11 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include +#include #include #include #include -#include +#include /** * @file config.h The configuration handling elements * diff --git a/server/include/maxscale.h b/include/maxscale/maxscale.h similarity index 100% rename from server/include/maxscale.h rename to include/maxscale/maxscale.h diff --git a/server/include/maxscale_pcre2.h b/include/maxscale/maxscale_pcre2.h similarity index 100% rename from server/include/maxscale_pcre2.h rename to include/maxscale/maxscale_pcre2.h diff --git a/server/include/memlog.h b/include/maxscale/memlog.h similarity index 97% rename from server/include/memlog.h rename to include/maxscale/memlog.h index 49167eb14..ef832b673 100644 --- a/server/include/memlog.h +++ b/include/maxscale/memlog.h @@ -24,7 +24,7 @@ * * @endverbatim */ -#include +#include typedef enum { ML_INT, ML_LONG, ML_LONGLONG, ML_STRING } MEMLOGTYPE; diff --git a/server/include/mlist.h b/include/maxscale/mlist.h similarity index 98% rename from server/include/mlist.h rename to include/maxscale/mlist.h index 11af38864..36eec847e 100644 --- a/server/include/mlist.h +++ b/include/maxscale/mlist.h @@ -13,7 +13,7 @@ * Public License. */ -#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/modinfo.h b/include/maxscale/modinfo.h similarity index 100% rename from server/include/modinfo.h rename to include/maxscale/modinfo.h diff --git a/server/include/modules.h b/include/maxscale/modules.h similarity index 95% rename from server/include/modules.h rename to include/maxscale/modules.h index c826e5a38..49abc562c 100644 --- a/server/include/modules.h +++ b/include/maxscale/modules.h @@ -12,10 +12,10 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include -#include -#include -#include +#include +#include +#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/modutil.h b/include/maxscale/modutil.h similarity index 97% rename from server/include/modutil.h rename to include/maxscale/modutil.h index 6d0c44e28..af48ca2ec 100644 --- a/server/include/modutil.h +++ b/include/maxscale/modutil.h @@ -26,10 +26,10 @@ * * @endverbatim */ -#include -#include +#include +#include #include -#include +#include #define PTR_IS_RESULTSET(b) (b[0] == 0x01 && b[1] == 0x0 && b[2] == 0x0 && b[3] == 0x01) #define PTR_IS_EOF(b) (b[0] == 0x05 && b[1] == 0x0 && b[2] == 0x0 && b[4] == 0xfe) diff --git a/server/include/monitor.h b/include/maxscale/monitor.h similarity index 97% rename from server/include/monitor.h rename to include/maxscale/monitor.h index 485d3baa9..7b2867391 100644 --- a/server/include/monitor.h +++ b/include/maxscale/monitor.h @@ -13,13 +13,13 @@ * Public License. */ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** * @file monitor.h The interface to the monitor module diff --git a/server/include/mysql_binlog.h b/include/maxscale/mysql_binlog.h similarity index 100% rename from server/include/mysql_binlog.h rename to include/maxscale/mysql_binlog.h diff --git a/server/include/mysql_utils.h b/include/maxscale/mysql_utils.h similarity index 96% rename from server/include/mysql_utils.h rename to include/maxscale/mysql_utils.h index 3cb26216f..329dfd6f8 100644 --- a/server/include/mysql_utils.h +++ b/include/maxscale/mysql_utils.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include /** Length-encoded integers */ size_t leint_bytes(uint8_t* ptr); diff --git a/server/include/notification.h b/include/maxscale/notification.h similarity index 100% rename from server/include/notification.h rename to include/maxscale/notification.h diff --git a/server/include/platform.h b/include/maxscale/platform.h similarity index 100% rename from server/include/platform.h rename to include/maxscale/platform.h diff --git a/server/include/maxscale/poll.h b/include/maxscale/poll.h similarity index 95% rename from server/include/maxscale/poll.h rename to include/maxscale/poll.h index 296915022..2e9a1ec20 100644 --- a/server/include/maxscale/poll.h +++ b/include/maxscale/poll.h @@ -12,9 +12,9 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include -#include -#include +#include +#include +#include #include /** diff --git a/server/include/query_classifier.h b/include/maxscale/query_classifier.h similarity index 98% rename from server/include/query_classifier.h rename to include/maxscale/query_classifier.h index 9d9ed0911..dbbc01fcb 100644 --- a/server/include/query_classifier.h +++ b/include/maxscale/query_classifier.h @@ -13,8 +13,8 @@ * Public License. */ -#include -#include +#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/queuemanager.h b/include/maxscale/queuemanager.h similarity index 98% rename from server/include/queuemanager.h rename to include/maxscale/queuemanager.h index b91b2e6e8..462dd10e4 100644 --- a/server/include/queuemanager.h +++ b/include/maxscale/queuemanager.h @@ -27,7 +27,7 @@ */ #include -#include +#include #define CONNECTION_QUEUE_LIMIT 1000 diff --git a/server/include/random_jkiss.h b/include/maxscale/random_jkiss.h similarity index 100% rename from server/include/random_jkiss.h rename to include/maxscale/random_jkiss.h diff --git a/server/include/rdtsc.h b/include/maxscale/rdtsc.h similarity index 100% rename from server/include/rdtsc.h rename to include/maxscale/rdtsc.h diff --git a/server/include/resultset.h b/include/maxscale/resultset.h similarity index 98% rename from server/include/resultset.h rename to include/maxscale/resultset.h index 231d13227..58b4f7a35 100644 --- a/server/include/resultset.h +++ b/include/maxscale/resultset.h @@ -24,7 +24,7 @@ * * @endverbatim */ -#include +#include /** diff --git a/server/include/router.h b/include/maxscale/router.h similarity index 97% rename from server/include/router.h rename to include/maxscale/router.h index 64e90fe6a..9dafcc9aa 100644 --- a/server/include/router.h +++ b/include/maxscale/router.h @@ -27,9 +27,9 @@ * 27/10/2015 Martin Brampton Add RCAP_TYPE_NO_RSESSION * */ -#include -#include -#include +#include +#include +#include #include /** diff --git a/server/include/secrets.h b/include/maxscale/secrets.h similarity index 100% rename from server/include/secrets.h rename to include/maxscale/secrets.h diff --git a/server/include/server.h b/include/maxscale/server.h similarity index 99% rename from server/include/server.h rename to include/maxscale/server.h index 3b38abb70..3daaa10dd 100644 --- a/server/include/server.h +++ b/include/maxscale/server.h @@ -12,8 +12,8 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include -#include +#include +#include /** * @file service.h diff --git a/server/include/service.h b/include/maxscale/service.h similarity index 96% rename from server/include/service.h rename to include/maxscale/service.h index 385ac727f..51b81ca6f 100644 --- a/server/include/service.h +++ b/include/maxscale/service.h @@ -14,16 +14,16 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/server/include/session.h b/include/maxscale/session.h similarity index 96% rename from server/include/session.h rename to include/maxscale/session.h index f808dfbf6..87497ad31 100644 --- a/server/include/session.h +++ b/include/maxscale/session.h @@ -34,13 +34,13 @@ * @endverbatim */ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include struct dcb; struct service; diff --git a/server/include/skygw_debug.h b/include/maxscale/skygw_debug.h similarity index 99% rename from server/include/skygw_debug.h rename to include/maxscale/skygw_debug.h index d01bd5134..da75fc057 100644 --- a/server/include/skygw_debug.h +++ b/include/maxscale/skygw_debug.h @@ -46,7 +46,7 @@ #endif /* SS_DEBUG || SS_PROF */ #if defined(SS_DEBUG) && defined(LOG_ASSERT) -#include +#include # define ss_dassert(exp) do { if(!(exp)){\ MXS_ERROR("debug assert %s:%d\n", (char*)__FILE__, __LINE__);\ mxs_log_flush_sync(); assert(exp);} } while (false) diff --git a/server/include/skygw_types.h b/include/maxscale/skygw_types.h similarity index 100% rename from server/include/skygw_types.h rename to include/maxscale/skygw_types.h diff --git a/server/include/skygw_utils.h b/include/maxscale/skygw_utils.h similarity index 98% rename from server/include/skygw_utils.h rename to include/maxscale/skygw_utils.h index 602f5fa03..a903466c3 100644 --- a/server/include/skygw_utils.h +++ b/include/maxscale/skygw_utils.h @@ -28,8 +28,8 @@ #endif #define FSYNCLIMIT 10 -#include "skygw_types.h" -#include "skygw_debug.h" +#include +#include #define DISKWRITE_LATENCY (5*MSEC_USEC) diff --git a/server/include/slist.h b/include/maxscale/slist.h similarity index 98% rename from server/include/slist.h rename to include/maxscale/slist.h index c7a179e95..725023b6d 100644 --- a/server/include/slist.h +++ b/include/maxscale/slist.h @@ -13,7 +13,7 @@ * Public License. */ -#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/spinlock.h b/include/maxscale/spinlock.h similarity index 98% rename from server/include/spinlock.h rename to include/maxscale/spinlock.h index 34794165c..7df6064b7 100644 --- a/server/include/spinlock.h +++ b/include/maxscale/spinlock.h @@ -23,7 +23,7 @@ * for the lock to be released. However they are useful in that they do not involve * system calls and are light weight when the expected wait time for a lock is low. */ -#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/include/statistics.h b/include/maxscale/statistics.h similarity index 100% rename from server/include/statistics.h rename to include/maxscale/statistics.h diff --git a/server/include/test_utils.h b/include/maxscale/test_utils.h similarity index 80% rename from server/include/test_utils.h rename to include/maxscale/test_utils.h index 7800ce1b3..d1ea666c8 100644 --- a/server/include/test_utils.h +++ b/include/maxscale/test_utils.h @@ -15,11 +15,11 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void init_test_env(char *path) { diff --git a/server/include/thread.h b/include/maxscale/thread.h similarity index 100% rename from server/include/thread.h rename to include/maxscale/thread.h diff --git a/server/include/users.h b/include/maxscale/users.h similarity index 96% rename from server/include/users.h rename to include/maxscale/users.h index 19f802c26..78a4b3731 100644 --- a/server/include/users.h +++ b/include/maxscale/users.h @@ -12,9 +12,9 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include -#include -#include +#include +#include +#include #include /** diff --git a/server/include/utils.h b/include/maxscale/utils.h similarity index 100% rename from server/include/utils.h rename to include/maxscale/utils.h diff --git a/server/include/version.h.in b/include/maxscale/version.h.in similarity index 100% rename from server/include/version.h.in rename to include/maxscale/version.h.in diff --git a/query_classifier/qc_dummy/qc_dummy.cc b/query_classifier/qc_dummy/qc_dummy.cc index 82f1381dd..2ee32e90c 100644 --- a/query_classifier/qc_dummy/qc_dummy.cc +++ b/query_classifier/qc_dummy/qc_dummy.cc @@ -11,8 +11,8 @@ * Public License. */ -#include -#include +#include +#include qc_parse_result_t qc_parse(GWBUF* querybuf) { diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc index b863b3f38..e9fd30a36 100644 --- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc +++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc @@ -55,12 +55,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include diff --git a/query_classifier/qc_sqlite/builtin_functions.c b/query_classifier/qc_sqlite/builtin_functions.c index 2ed96ecfb..2cb2ed797 100644 --- a/query_classifier/qc_sqlite/builtin_functions.c +++ b/query_classifier/qc_sqlite/builtin_functions.c @@ -5,7 +5,7 @@ #include "builtin_functions.h" #include #include -#include +#include static struct { diff --git a/query_classifier/qc_sqlite/qc_sqlite.c b/query_classifier/qc_sqlite/qc_sqlite.c index eff117691..686b4821c 100644 --- a/query_classifier/qc_sqlite/qc_sqlite.c +++ b/query_classifier/qc_sqlite/qc_sqlite.c @@ -15,13 +15,13 @@ #include #include -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "builtin_functions.h" diff --git a/query_classifier/test/canonical_tests/canonizer.c b/query_classifier/test/canonical_tests/canonizer.c index 5609ecec7..9dc4a5c49 100644 --- a/query_classifier/test/canonical_tests/canonizer.c +++ b/query_classifier/test/canonical_tests/canonizer.c @@ -15,9 +15,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include int main(int argc, char** argv) { diff --git a/query_classifier/test/classify.c b/query_classifier/test/classify.c index 43449f969..9a51cc9fe 100644 --- a/query_classifier/test/classify.c +++ b/query_classifier/test/classify.c @@ -16,12 +16,12 @@ #include #include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include char* append(char* types, const char* type_name, size_t* lenp) { diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc index b289881a6..b52d06a1f 100644 --- a/query_classifier/test/compare.cc +++ b/query_classifier/test/compare.cc @@ -20,10 +20,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include using std::cerr; using std::cin; using std::cout; diff --git a/server/core/adminusers.c b/server/core/adminusers.c index ba7738964..6b0f1693c 100644 --- a/server/core/adminusers.c +++ b/server/core/adminusers.c @@ -19,11 +19,11 @@ #endif #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include /** diff --git a/server/core/alloc.c b/server/core/alloc.c index 6ac095181..6ecaabcc3 100644 --- a/server/core/alloc.c +++ b/server/core/alloc.c @@ -13,7 +13,7 @@ #include #include -#include +#include /** * @brief Allocates memory; behaves exactly like `malloc`. diff --git a/server/core/authenticator.c b/server/core/authenticator.c index d70bdb785..30b766e29 100644 --- a/server/core/authenticator.c +++ b/server/core/authenticator.c @@ -11,9 +11,9 @@ * Public License. */ -#include -#include -#include +#include +#include +#include #include /** diff --git a/server/core/buffer.c b/server/core/buffer.c index 1b13b5fa5..9d55aaff9 100644 --- a/server/core/buffer.c +++ b/server/core/buffer.c @@ -37,19 +37,19 @@ * * @endverbatim */ -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #if defined(BUFFER_TRACE) -#include +#include #include static HASHTABLE *buffer_hashtable = NULL; diff --git a/server/core/config.c b/server/core/config.c index e9848769f..060386f97 100644 --- a/server/core/config.c +++ b/server/core/config.c @@ -50,30 +50,30 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #define PCRE2_CODE_UNIT_WIDTH 8 diff --git a/server/core/dbusers.c b/server/core/dbusers.c index 7927e1a90..ab304107e 100644 --- a/server/core/dbusers.c +++ b/server/core/dbusers.c @@ -39,17 +39,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include /** Don't include the root user */ diff --git a/server/core/dcb.c b/server/core/dcb.c index 9f7e54f99..27e324d37 100644 --- a/server/core/dcb.c +++ b/server/core/dcb.c @@ -69,23 +69,23 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/server/core/externcmd.c b/server/core/externcmd.c index c38041f21..9bcef24ae 100644 --- a/server/core/externcmd.c +++ b/server/core/externcmd.c @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include /** diff --git a/server/core/filter.c b/server/core/filter.c index 3571890c4..45fa3721a 100644 --- a/server/core/filter.c +++ b/server/core/filter.c @@ -26,12 +26,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include static SPINLOCK filter_spin = SPINLOCK_INIT; /**< Protects the list of all filters */ diff --git a/server/core/gateway.c b/server/core/gateway.c index 657c37add..f8e567344 100644 --- a/server/core/gateway.c +++ b/server/core/gateway.c @@ -48,35 +48,35 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include @@ -84,7 +84,7 @@ #include #include #include -#include +#include #include #define STRING_BUFFER_SIZE 1024 diff --git a/server/core/gw_ssl.c b/server/core/gw_ssl.c index 483b138dc..1951fcd7b 100644 --- a/server/core/gw_ssl.c +++ b/server/core/gw_ssl.c @@ -29,9 +29,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include /** diff --git a/server/core/gw_utils.c b/server/core/gw_utils.c index 29f8d96de..d7489d49a 100644 --- a/server/core/gw_utils.c +++ b/server/core/gw_utils.c @@ -34,12 +34,12 @@ *@endverbatim */ -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include SPINLOCK tmplock = SPINLOCK_INIT; diff --git a/server/core/gwbitmask.c b/server/core/gwbitmask.c index ac163e395..bfa78d5eb 100644 --- a/server/core/gwbitmask.c +++ b/server/core/gwbitmask.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include /** diff --git a/server/core/gwdirs.c b/server/core/gwdirs.c index 2a9aef8c8..d7c54be0f 100644 --- a/server/core/gwdirs.c +++ b/server/core/gwdirs.c @@ -11,9 +11,9 @@ * Public License. */ -#include +#include #include -#include +#include /** * Set the configuration file directory diff --git a/server/core/hashtable.c b/server/core/hashtable.c index 650b2ee06..30975784b 100644 --- a/server/core/hashtable.c +++ b/server/core/hashtable.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include /** * @file hashtable.c General purpose hashtable routines diff --git a/server/core/hint.c b/server/core/hint.c index 7cfb01f70..62e17a2f1 100644 --- a/server/core/hint.c +++ b/server/core/hint.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include /** diff --git a/server/core/housekeeper.c b/server/core/housekeeper.c index 19d96c7d3..48096b2f3 100644 --- a/server/core/housekeeper.c +++ b/server/core/housekeeper.c @@ -13,10 +13,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include /** * @file housekeeper.c Provide a mechanism to run periodic tasks diff --git a/server/core/listener.c b/server/core/listener.c index 249119d78..a7de9403e 100644 --- a/server/core/listener.c +++ b/server/core/listener.c @@ -30,13 +30,13 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include static RSA *rsa_512 = NULL; static RSA *rsa_1024 = NULL; diff --git a/server/core/listmanager.c b/server/core/listmanager.c index 63c987300..373186fd7 100644 --- a/server/core/listmanager.c +++ b/server/core/listmanager.c @@ -31,10 +31,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include /** diff --git a/server/core/load_utils.c b/server/core/load_utils.c index 36ce7200c..ad83cfccf 100644 --- a/server/core/load_utils.c +++ b/server/core/load_utils.c @@ -34,17 +34,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include static MODULES *registered = NULL; diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc index ddcbcd1e5..75e855423 100644 --- a/server/core/log_manager.cc +++ b/server/core/log_manager.cc @@ -10,7 +10,7 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include +#include #include #include #include @@ -23,14 +23,14 @@ #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #define MAX_PREFIXLEN 250 diff --git a/server/core/maxkeys.c b/server/core/maxkeys.c index 5103f908c..380338329 100644 --- a/server/core/maxkeys.c +++ b/server/core/maxkeys.c @@ -24,10 +24,10 @@ */ #include #include -#include -#include -#include -#include +#include +#include +#include +#include struct option options[] = { diff --git a/server/core/maxpasswd.c b/server/core/maxpasswd.c index 0e1650b76..4a7c77a2a 100644 --- a/server/core/maxpasswd.c +++ b/server/core/maxpasswd.c @@ -23,10 +23,10 @@ * @endverbatim */ #include -#include -#include -#include -#include +#include +#include +#include +#include struct option options[] = { diff --git a/server/core/maxscale_pcre2.c b/server/core/maxscale_pcre2.c index c13eb323b..484767994 100644 --- a/server/core/maxscale_pcre2.c +++ b/server/core/maxscale_pcre2.c @@ -24,7 +24,7 @@ * @endverbatim */ -#include +#include #include /** diff --git a/server/core/memlog.c b/server/core/memlog.c index 20ed56ce5..a22cd36d5 100644 --- a/server/core/memlog.c +++ b/server/core/memlog.c @@ -22,13 +22,13 @@ * * @endverbatim */ -#include +#include #include #include #include #include #include -#include +#include static MEMLOG *memlogs = NULL; static SPINLOCK memlock = SPINLOCK_INIT; diff --git a/server/core/misc.c b/server/core/misc.c index b43b362e6..4f1e31774 100644 --- a/server/core/misc.c +++ b/server/core/misc.c @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include static time_t started; diff --git a/server/core/mlist.c b/server/core/mlist.c index 0242bcfff..c83df050b 100644 --- a/server/core/mlist.c +++ b/server/core/mlist.c @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include static void mlist_free_memory(mlist_t* ml, char* name); diff --git a/server/core/modutil.c b/server/core/modutil.c index 4026f3277..9a0daba9c 100644 --- a/server/core/modutil.c +++ b/server/core/modutil.c @@ -24,12 +24,12 @@ * * @endverbatim */ -#include +#include #include #include #include #include -#include +#include #include /** These are used when converting MySQL wildcards to regular expressions */ diff --git a/server/core/monitor.c b/server/core/monitor.c index e2143b319..8cdafe660 100644 --- a/server/core/monitor.c +++ b/server/core/monitor.c @@ -30,16 +30,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include /* @@ -52,7 +52,7 @@ #define ADDITEM( _event_type, _event_name ) { #_event_name } const monitor_def_t monitor_event_definitions[MAX_MONITOR_EVENT] = { -#include "def_monitor_event.h" +#include }; #undef ADDITEM diff --git a/server/core/mysql_binlog.c b/server/core/mysql_binlog.c index 342c7c34c..6e52cc47b 100644 --- a/server/core/mysql_binlog.c +++ b/server/core/mysql_binlog.c @@ -15,14 +15,14 @@ * @file mysql_binlog.c - Extracting information from binary logs */ -#include -#include +#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include /** diff --git a/server/core/mysql_utils.c b/server/core/mysql_utils.c index 7671bbf35..3c1b2159c 100644 --- a/server/core/mysql_utils.c +++ b/server/core/mysql_utils.c @@ -20,13 +20,13 @@ * row based replication. */ -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include /** * @brief Calculate the length of a length-encoded integer in bytes diff --git a/server/core/poll.c b/server/core/poll.c index 1f79aa5fb..d68a44e26 100644 --- a/server/core/poll.c +++ b/server/core/poll.c @@ -21,20 +21,20 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #define PROFILE_POLL 0 diff --git a/server/core/query_classifier.c b/server/core/query_classifier.c index 2e3de362d..0c984df43 100644 --- a/server/core/query_classifier.c +++ b/server/core/query_classifier.c @@ -11,10 +11,10 @@ * Public License. */ -#include -#include -#include -#include +#include +#include +#include +#include #include //#define QC_TRACE_ENABLED diff --git a/server/core/queuemanager.c b/server/core/queuemanager.c index ae615b1d7..9ddafb487 100644 --- a/server/core/queuemanager.c +++ b/server/core/queuemanager.c @@ -28,12 +28,12 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #if defined(SS_DEBUG) int debug_check_fail = 0; diff --git a/server/core/random_jkiss.c b/server/core/random_jkiss.c index 83b3d5e19..bc81b9fcc 100644 --- a/server/core/random_jkiss.c +++ b/server/core/random_jkiss.c @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include /* Public domain code for JKISS RNG - Comment header added */ diff --git a/server/core/resultset.c b/server/core/resultset.c index 67e8a2da7..c8ccd8541 100644 --- a/server/core/resultset.c +++ b/server/core/resultset.c @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static int mysql_send_fieldcount(DCB *, int); diff --git a/server/core/secrets.c b/server/core/secrets.c index 70014a2ee..f9716bc3a 100644 --- a/server/core/secrets.c +++ b/server/core/secrets.c @@ -11,17 +11,17 @@ * Public License. */ -#include +#include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include -#include "gw.h" +#include /** * Generate a random printable character diff --git a/server/core/server.c b/server/core/server.c index 516ae7094..db3c49f94 100644 --- a/server/core/server.c +++ b/server/core/server.c @@ -35,16 +35,16 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include +#include static SPINLOCK server_spin = SPINLOCK_INIT; static SERVER *allServers = NULL; diff --git a/server/core/service.c b/server/core/service.c index 4452d6604..be80fc8c1 100644 --- a/server/core/service.c +++ b/server/core/service.c @@ -42,30 +42,30 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include /** To be used with configuration type checks */ diff --git a/server/core/session.c b/server/core/session.c index 3aef74e1d..f6ce149f6 100644 --- a/server/core/session.c +++ b/server/core/session.c @@ -33,16 +33,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* This list of all sessions */ LIST_CONFIG SESSIONlist = diff --git a/server/core/skygw_utils.cc b/server/core/skygw_utils.cc index a8c13e9bd..c219d2521 100644 --- a/server/core/skygw_utils.cc +++ b/server/core/skygw_utils.cc @@ -23,12 +23,12 @@ #include #include #include -#include "skygw_debug.h" -#include +#include +#include #include -#include "skygw_utils.h" -#include -#include +#include +#include +#include #include static void simple_mutex_free_memory(simple_mutex_t* sm); diff --git a/server/core/slist.c b/server/core/slist.c index 7f43b6421..ab5cdd7ca 100644 --- a/server/core/slist.c +++ b/server/core/slist.c @@ -11,9 +11,9 @@ * Public License. */ -#include +#include #include -#include +#include static slist_cursor_t* slist_cursor_init(slist_t* list); static slist_t* slist_init_ex(bool create_cursors); diff --git a/server/core/spinlock.c b/server/core/spinlock.c index e2c59978a..9772eb65f 100644 --- a/server/core/spinlock.c +++ b/server/core/spinlock.c @@ -23,10 +23,10 @@ * @endverbatim */ -#include -#include +#include +#include #include -#include +#include /** * Initialise a spinlock. diff --git a/server/core/statistics.c b/server/core/statistics.c index 300f835d9..259608efa 100644 --- a/server/core/statistics.c +++ b/server/core/statistics.c @@ -23,11 +23,11 @@ * @endverbatim */ -#include +#include #include -#include +#include #include -#include +#include static int thread_count = 0; static bool stats_initialized = false; diff --git a/server/core/test/test_mysql_users.c b/server/core/test/test_mysql_users.c index 8ab3439a4..0defa3ff6 100644 --- a/server/core/test/test_mysql_users.c +++ b/server/core/test/test_mysql_users.c @@ -28,16 +28,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include #include diff --git a/server/core/test/testadminusers.c b/server/core/test/testadminusers.c index 13f62804a..4ea8f5e88 100644 --- a/server/core/test/testadminusers.c +++ b/server/core/test/testadminusers.c @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/server/core/test/testbuffer.c b/server/core/test/testbuffer.c index 6c6e4ce3d..119bd464d 100644 --- a/server/core/test/testbuffer.c +++ b/server/core/test/testbuffer.c @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include /** * Generate predefined test data diff --git a/server/core/test/testdcb.c b/server/core/test/testdcb.c index c568380bc..756487297 100644 --- a/server/core/test/testdcb.c +++ b/server/core/test/testdcb.c @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include /** * test1 Allocate a dcb and do lots of other things diff --git a/server/core/test/testfeedback.c b/server/core/test/testfeedback.c index 763332aa7..fe8736442 100644 --- a/server/core/test/testfeedback.c +++ b/server/core/test/testfeedback.c @@ -34,17 +34,17 @@ #include #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include static char* server_options[] = { diff --git a/server/core/test/testfilter.c b/server/core/test/testfilter.c index bc96c21f2..377f5a7af 100644 --- a/server/core/test/testfilter.c +++ b/server/core/test/testfilter.c @@ -33,7 +33,7 @@ #include #include -#include +#include /** diff --git a/server/core/test/testgwbitmask.c b/server/core/test/testgwbitmask.c index 34edb5510..751920624 100644 --- a/server/core/test/testgwbitmask.c +++ b/server/core/test/testgwbitmask.c @@ -33,9 +33,9 @@ #include #include -#include +#include -#include +#include /** * test1 Create a bitmap and mess around with it diff --git a/server/core/test/testhash.c b/server/core/test/testhash.c index d7de067a5..902034216 100644 --- a/server/core/test/testhash.c +++ b/server/core/test/testhash.c @@ -36,8 +36,8 @@ #include #include -#include -#include +#include +#include static void read_lock(HASHTABLE *table) diff --git a/server/core/test/testhint.c b/server/core/test/testhint.c index 0174ddd92..afb9cc700 100644 --- a/server/core/test/testhint.c +++ b/server/core/test/testhint.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include /** diff --git a/server/core/test/testlog.c b/server/core/test/testlog.c index c0549e8d4..2f48b71aa 100644 --- a/server/core/test/testlog.c +++ b/server/core/test/testlog.c @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include static void skygw_log_enable(int priority) { diff --git a/server/core/test/testlogorder.c b/server/core/test/testlogorder.c index d8116a6ab..42b9f78cb 100644 --- a/server/core/test/testlogorder.c +++ b/server/core/test/testlogorder.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include static void skygw_log_enable(int priority) { diff --git a/server/core/test/testlogthrottling.cc b/server/core/test/testlogthrottling.cc index 45c0982d4..cb0f227bb 100644 --- a/server/core/test/testlogthrottling.cc +++ b/server/core/test/testlogthrottling.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include using std::cerr; using std::cout; diff --git a/server/core/test/testmaxscalepcre2.c b/server/core/test/testmaxscalepcre2.c index 289de88d2..f75551f0c 100644 --- a/server/core/test/testmaxscalepcre2.c +++ b/server/core/test/testmaxscalepcre2.c @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #define test_assert(a, b) if(!(a)){fprintf(stderr, b);return 1;} diff --git a/server/core/test/testmemlog.c b/server/core/test/testmemlog.c index 21060661a..d37d0064d 100644 --- a/server/core/test/testmemlog.c +++ b/server/core/test/testmemlog.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include /** * Count the number of lines in a file diff --git a/server/core/test/testmodutil.c b/server/core/test/testmodutil.c index 401b2147c..043629571 100644 --- a/server/core/test/testmodutil.c +++ b/server/core/test/testmodutil.c @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include /** * test1 Allocate a service and do lots of other things diff --git a/server/core/test/testpoll.c b/server/core/test/testpoll.c index 0dce61a51..74c55b4f9 100644 --- a/server/core/test/testpoll.c +++ b/server/core/test/testpoll.c @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include /** * test1 Allocate a service and do lots of other things diff --git a/server/core/test/testqueuemanager.c b/server/core/test/testqueuemanager.c index cd250f816..e616d9c99 100644 --- a/server/core/test/testqueuemanager.c +++ b/server/core/test/testqueuemanager.c @@ -37,10 +37,10 @@ extern int debug_check_fail; #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include /** diff --git a/server/core/test/testserver.c b/server/core/test/testserver.c index 2424cedcb..d1e214de2 100644 --- a/server/core/test/testserver.c +++ b/server/core/test/testserver.c @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include /** * test1 Allocate a server and do lots of other things * diff --git a/server/core/test/testservice.c b/server/core/test/testservice.c index cd896adc3..13ff6e9bc 100644 --- a/server/core/test/testservice.c +++ b/server/core/test/testservice.c @@ -32,10 +32,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include /** diff --git a/server/core/test/testspinlock.c b/server/core/test/testspinlock.c index 0992783c6..1d291a208 100644 --- a/server/core/test/testspinlock.c +++ b/server/core/test/testspinlock.c @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include /** diff --git a/server/core/test/testusers.c b/server/core/test/testusers.c index a37ee2579..f6bea1ef6 100644 --- a/server/core/test/testusers.c +++ b/server/core/test/testusers.c @@ -33,9 +33,9 @@ #include #include -#include +#include -#include "log_manager.h" +#include /** * test1 Allocate table of users and mess around with it diff --git a/server/core/thread.c b/server/core/thread.c index 415faac3b..3cc32b09a 100644 --- a/server/core/thread.c +++ b/server/core/thread.c @@ -10,7 +10,7 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include +#include /** * @file thread.c - Implementation of thread related operations diff --git a/server/core/users.c b/server/core/users.c index 66ebe3001..2c2a7ca56 100644 --- a/server/core/users.c +++ b/server/core/users.c @@ -13,10 +13,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include /** * @file users.c User table maintenance routines diff --git a/server/core/utils.c b/server/core/utils.c index c01dcde89..b439f4fca 100644 --- a/server/core/utils.c +++ b/server/core/utils.c @@ -29,16 +29,16 @@ */ -#include -#include -#include +#include +#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include /* used in the hex2bin function */ #define char_val(X) (X >= '0' && X <= '9' ? X-'0' : \ diff --git a/server/modules/authenticator/cdc_plain_auth.c b/server/modules/authenticator/cdc_plain_auth.c index 909070c92..541d22441 100644 --- a/server/modules/authenticator/cdc_plain_auth.c +++ b/server/modules/authenticator/cdc_plain_auth.c @@ -25,10 +25,10 @@ * @endverbatim */ -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/server/modules/authenticator/gssapi_auth.c b/server/modules/authenticator/gssapi_auth.c index 81fedf769..90abc0f33 100644 --- a/server/modules/authenticator/gssapi_auth.c +++ b/server/modules/authenticator/gssapi_auth.c @@ -11,9 +11,9 @@ * Public License. */ -#include +#include #include -#include +#include #include #include "gssapi_auth.h" diff --git a/server/modules/authenticator/gssapi_backend_auth.c b/server/modules/authenticator/gssapi_backend_auth.c index 1f5d5883c..d1b7903bc 100644 --- a/server/modules/authenticator/gssapi_backend_auth.c +++ b/server/modules/authenticator/gssapi_backend_auth.c @@ -11,9 +11,9 @@ * Public License. */ -#include +#include #include -#include +#include #include #include "gssapi_auth.h" diff --git a/server/modules/authenticator/http_auth.c b/server/modules/authenticator/http_auth.c index c9e912a59..a8e24b04d 100644 --- a/server/modules/authenticator/http_auth.c +++ b/server/modules/authenticator/http_auth.c @@ -24,15 +24,15 @@ * @endverbatim */ -#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/authenticator/max_admin_auth.c b/server/modules/authenticator/max_admin_auth.c index 3afc7ce97..1ee62ce15 100644 --- a/server/modules/authenticator/max_admin_auth.c +++ b/server/modules/authenticator/max_admin_auth.c @@ -26,13 +26,13 @@ * @endverbatim */ -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/authenticator/mysql_auth.c b/server/modules/authenticator/mysql_auth.c index aee9a65e3..e92088f3c 100644 --- a/server/modules/authenticator/mysql_auth.c +++ b/server/modules/authenticator/mysql_auth.c @@ -27,14 +27,14 @@ #include #include -#include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/authenticator/mysql_backend_auth.c b/server/modules/authenticator/mysql_backend_auth.c index bde267850..ff7b37c69 100644 --- a/server/modules/authenticator/mysql_backend_auth.c +++ b/server/modules/authenticator/mysql_backend_auth.c @@ -29,10 +29,10 @@ * @endverbatim */ -#include +#include #include #include -#include +#include /** Authentication states */ enum mba_state diff --git a/server/modules/authenticator/null_auth_allow.c b/server/modules/authenticator/null_auth_allow.c index 8d5329c18..78d2c90ea 100644 --- a/server/modules/authenticator/null_auth_allow.c +++ b/server/modules/authenticator/null_auth_allow.c @@ -27,11 +27,11 @@ * @endverbatim */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/authenticator/null_auth_deny.c b/server/modules/authenticator/null_auth_deny.c index 424b625f8..034b6c28e 100644 --- a/server/modules/authenticator/null_auth_deny.c +++ b/server/modules/authenticator/null_auth_deny.c @@ -27,11 +27,11 @@ * @endverbatim */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/filter/cache/cache.c b/server/modules/filter/cache/cache.c index f500c5454..d0d76c0cd 100644 --- a/server/modules/filter/cache/cache.c +++ b/server/modules/filter/cache/cache.c @@ -13,13 +13,13 @@ #define MXS_MODULE_NAME "cache" #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "cache.h" #include "rules.h" #include "storage.h" diff --git a/server/modules/filter/cache/cache_storage_api.h b/server/modules/filter/cache/cache_storage_api.h index c6f889c3e..320e25f00 100644 --- a/server/modules/filter/cache/cache_storage_api.h +++ b/server/modules/filter/cache/cache_storage_api.h @@ -15,9 +15,9 @@ #include #include -#include +#include #include -#include +#include EXTERN_C_BLOCK_BEGIN diff --git a/server/modules/filter/cache/rules.c b/server/modules/filter/cache/rules.c index 27f769f54..e66ae84c1 100644 --- a/server/modules/filter/cache/rules.c +++ b/server/modules/filter/cache/rules.c @@ -16,10 +16,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include "cache.h" static const char KEY_ATTRIBUTE[] = "attribute"; diff --git a/server/modules/filter/cache/rules.h b/server/modules/filter/cache/rules.h index d805b6451..58e04716c 100644 --- a/server/modules/filter/cache/rules.h +++ b/server/modules/filter/cache/rules.h @@ -15,9 +15,9 @@ #include #include -#include -#include -#include +#include +#include +#include typedef enum cache_rule_attribute diff --git a/server/modules/filter/cache/storage.c b/server/modules/filter/cache/storage.c index 7aa51b82e..165905dd1 100644 --- a/server/modules/filter/cache/storage.c +++ b/server/modules/filter/cache/storage.c @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include CACHE_STORAGE_MODULE* cache_storage_open(const char *name) { diff --git a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc index fdffe3b82..2fdbc5b1c 100644 --- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc +++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc @@ -19,13 +19,13 @@ #include #include #include -#include +#include extern "C" { // TODO: Add extern "C" to modutil.h -#include +#include } -#include +#include #include "rocksdbinternals.h" using std::for_each; diff --git a/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.h b/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.h index 63b5d10bd..895421d4b 100644 --- a/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.h +++ b/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.h @@ -14,6 +14,6 @@ */ #define MXS_MODULE_NAME "storage_rocksdb" -#include +#include #endif diff --git a/server/modules/filter/cache/test/testrules.c b/server/modules/filter/cache/test/testrules.c index d8f075558..d717fd5a4 100644 --- a/server/modules/filter/cache/test/testrules.c +++ b/server/modules/filter/cache/test/testrules.c @@ -13,11 +13,11 @@ #include #include "rules.h" -#include +#include #if !defined(SS_DEBUG) #define SS_DEBUG #endif -#include +#include struct test_case { diff --git a/server/modules/filter/ccrfilter/ccrfilter.c b/server/modules/filter/ccrfilter/ccrfilter.c index ffcb9777e..e334e9f02 100644 --- a/server/modules/filter/ccrfilter/ccrfilter.c +++ b/server/modules/filter/ccrfilter/ccrfilter.c @@ -11,14 +11,14 @@ * Public License. */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.c b/server/modules/filter/dbfwfilter/dbfwfilter.c index c4baa3a58..1510af39c 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.c +++ b/server/modules/filter/dbfwfilter/dbfwfilter.c @@ -62,20 +62,20 @@ #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include "dbfwfilter.h" #include #include #include diff --git a/server/modules/filter/dbfwfilter/ruleparser.y b/server/modules/filter/dbfwfilter/ruleparser.y index 96dce952b..d90ab47b4 100644 --- a/server/modules/filter/dbfwfilter/ruleparser.y +++ b/server/modules/filter/dbfwfilter/ruleparser.y @@ -19,8 +19,8 @@ %{ #include -#include -#include +#include "dbfwfilter.h" +#include %} /** We need a reentrant scanner so no global variables are used */ diff --git a/server/modules/filter/gatekeeper/gatekeeper.c b/server/modules/filter/gatekeeper/gatekeeper.c index 35b9a67fa..f51ffa0e6 100644 --- a/server/modules/filter/gatekeeper/gatekeeper.c +++ b/server/modules/filter/gatekeeper/gatekeeper.c @@ -12,13 +12,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #define GK_DEFAULT_HASHTABLE_SIZE 1000 diff --git a/server/modules/filter/hintfilter/hintfilter.c b/server/modules/filter/hintfilter/hintfilter.c index 6669ab64f..87f74bbb3 100644 --- a/server/modules/filter/hintfilter/hintfilter.c +++ b/server/modules/filter/hintfilter/hintfilter.c @@ -11,10 +11,10 @@ * Public License. */ #include -#include +#include #include -#include -#include +#include +#include #include /** diff --git a/server/modules/filter/hintfilter/hintparser.c b/server/modules/filter/hintfilter/hintparser.c index bade7e684..ab72b8ccd 100644 --- a/server/modules/filter/hintfilter/hintparser.c +++ b/server/modules/filter/hintfilter/hintparser.c @@ -13,11 +13,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/server/modules/filter/luafilter/luafilter.c b/server/modules/filter/luafilter/luafilter.c index 80f2de37e..941d2f87a 100644 --- a/server/modules/filter/luafilter/luafilter.c +++ b/server/modules/filter/luafilter/luafilter.c @@ -36,14 +36,14 @@ * or diagnostic being made for the session script. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "lua.h" #include "lualib.h" #include "lauxlib.h" diff --git a/server/modules/filter/mqfilter/mqfilter.c b/server/modules/filter/mqfilter/mqfilter.c index 734ab9ad4..71faca490 100644 --- a/server/modules/filter/mqfilter/mqfilter.c +++ b/server/modules/filter/mqfilter/mqfilter.c @@ -59,23 +59,23 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include MODULE_INFO info = diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.c b/server/modules/filter/namedserverfilter/namedserverfilter.c index 96b639237..0dcbd662b 100644 --- a/server/modules/filter/namedserverfilter/namedserverfilter.c +++ b/server/modules/filter/namedserverfilter/namedserverfilter.c @@ -13,14 +13,14 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #include /** diff --git a/server/modules/filter/qlafilter/qlafilter.c b/server/modules/filter/qlafilter/qlafilter.c index b24a32ed2..eece0cb0f 100644 --- a/server/modules/filter/qlafilter/qlafilter.c +++ b/server/modules/filter/qlafilter/qlafilter.c @@ -37,16 +37,16 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include MODULE_INFO info = diff --git a/server/modules/filter/regexfilter/regexfilter.c b/server/modules/filter/regexfilter/regexfilter.c index de84270dd..c0e2a6ee6 100644 --- a/server/modules/filter/regexfilter/regexfilter.c +++ b/server/modules/filter/regexfilter/regexfilter.c @@ -13,16 +13,16 @@ #define PCRE2_CODE_UNIT_WIDTH 8 #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #include -#include "maxconfig.h" +#include /** * @file regexfilter.c - a very simple regular expression rewrite filter. diff --git a/server/modules/filter/tee/tee.c b/server/modules/filter/tee/tee.c index 81eed1f60..481cd0559 100644 --- a/server/modules/filter/tee/tee.c +++ b/server/modules/filter/tee/tee.c @@ -43,23 +43,23 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include -#include +#include #define MYSQL_COM_QUIT 0x01 #define MYSQL_COM_INITDB 0x02 diff --git a/server/modules/filter/testfilter/testfilter.c b/server/modules/filter/testfilter/testfilter.c index 00711b50a..8caa25b6e 100644 --- a/server/modules/filter/testfilter/testfilter.c +++ b/server/modules/filter/testfilter/testfilter.c @@ -11,11 +11,11 @@ * Public License. */ #include -#include +#include #include -#include -#include -#include +#include +#include +#include /** * @file testfilter.c - a very simple test filter. diff --git a/server/modules/filter/topfilter/topfilter.c b/server/modules/filter/topfilter/topfilter.c index d2e7d72c9..4596f381c 100644 --- a/server/modules/filter/topfilter/topfilter.c +++ b/server/modules/filter/topfilter/topfilter.c @@ -34,16 +34,16 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include MODULE_INFO info = diff --git a/server/modules/filter/tpmfilter/tpmfilter.c b/server/modules/filter/tpmfilter/tpmfilter.c index d17823a0f..d803421a4 100644 --- a/server/modules/filter/tpmfilter/tpmfilter.c +++ b/server/modules/filter/tpmfilter/tpmfilter.c @@ -41,16 +41,16 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include /** Defined in log_manager.cc */ extern int lm_enabled_logfiles_bitmask; diff --git a/server/modules/include/avrorouter.h b/server/modules/include/avrorouter.h index ab2f2b88e..83e018f7c 100644 --- a/server/modules/include/avrorouter.h +++ b/server/modules/include/avrorouter.h @@ -20,16 +20,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/server/modules/include/blr.h b/server/modules/include/blr.h index 5f0759a6a..7f423da0a 100644 --- a/server/modules/include/blr.h +++ b/server/modules/include/blr.h @@ -37,12 +37,12 @@ * * @endverbatim */ -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/server/modules/include/cdc.h b/server/modules/include/cdc.h index 1702f8ac6..80f0d0c81 100644 --- a/server/modules/include/cdc.h +++ b/server/modules/include/cdc.h @@ -21,19 +21,19 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define CDC_SMALL_BUFFER 1024 #define CDC_METHOD_MAXLEN 128 diff --git a/server/modules/include/debugcli.h b/server/modules/include/debugcli.h index 1e956e9e1..f736038b3 100644 --- a/server/modules/include/debugcli.h +++ b/server/modules/include/debugcli.h @@ -13,9 +13,9 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include -#include -#include +#include +#include +#include /** * @file debugcli.h The debug interface to the gateway diff --git a/server/modules/include/httpd.h b/server/modules/include/httpd.h index 3f8458db8..0bc8096af 100644 --- a/server/modules/include/httpd.h +++ b/server/modules/include/httpd.h @@ -21,19 +21,19 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include -#include -#include +#include +#include #define HTTPD_SMALL_BUFFER 1024 #define HTTPD_METHOD_MAXLEN 128 diff --git a/server/modules/include/maxinfo.h b/server/modules/include/maxinfo.h index 8c3751fbc..08fa63f24 100644 --- a/server/modules/include/maxinfo.h +++ b/server/modules/include/maxinfo.h @@ -12,9 +12,9 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include -#include -#include +#include +#include +#include /** * @file maxinfo.h The MaxScale information schema provider diff --git a/server/modules/include/maxscaled.h b/server/modules/include/maxscaled.h index 660bd37db..8dff6aedb 100644 --- a/server/modules/include/maxscaled.h +++ b/server/modules/include/maxscaled.h @@ -24,9 +24,9 @@ * * @endverbatim */ -#include -#include -#include +#include +#include +#include /** * The maxscaled specific protocol structure to put in the DCB. */ diff --git a/server/modules/include/mysql_auth.h b/server/modules/include/mysql_auth.h index 7f0192c69..bd02dea59 100644 --- a/server/modules/include/mysql_auth.h +++ b/server/modules/include/mysql_auth.h @@ -23,8 +23,8 @@ * @endverbatim */ -#include -#include +#include +#include #include #include diff --git a/server/modules/include/mysql_client_server_protocol.h b/server/modules/include/mysql_client_server_protocol.h index 2ef9ad71d..45a18f959 100644 --- a/server/modules/include/mysql_client_server_protocol.h +++ b/server/modules/include/mysql_client_server_protocol.h @@ -54,13 +54,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #define GW_MYSQL_VERSION "5.5.5-10.0.0 " MAXSCALE_VERSION "-maxscale" diff --git a/server/modules/include/mysqlhint.h b/server/modules/include/mysqlhint.h index b6dfcc538..85c9739fc 100644 --- a/server/modules/include/mysqlhint.h +++ b/server/modules/include/mysqlhint.h @@ -19,7 +19,7 @@ * Date Who Description * 17-07-2014 Mark Riddoch Initial implementation */ -#include +#include /* Parser tokens for the hint parser */ typedef enum diff --git a/server/modules/include/readconnection.h b/server/modules/include/readconnection.h index 7d7c56f4b..3fcbcb5d9 100644 --- a/server/modules/include/readconnection.h +++ b/server/modules/include/readconnection.h @@ -25,7 +25,7 @@ * * @endverbatim */ -#include +#include /** * Internal structure used to define the set of backend servers we are routing diff --git a/server/modules/include/readwritesplit.h b/server/modules/include/readwritesplit.h index d309f2f48..3787155c0 100644 --- a/server/modules/include/readwritesplit.h +++ b/server/modules/include/readwritesplit.h @@ -24,8 +24,8 @@ * @endverbatim */ -#include -#include +#include +#include #include #undef PREP_STMT_CACHING diff --git a/server/modules/include/rwsplit_internal.h b/server/modules/include/rwsplit_internal.h index 9fadc8982..c090914a9 100644 --- a/server/modules/include/rwsplit_internal.h +++ b/server/modules/include/rwsplit_internal.h @@ -25,7 +25,7 @@ extern "C" { #endif -#include +#include /* This needs to be removed along with dependency on it - see the * rwsplit_tmp_table_multi functions diff --git a/server/modules/include/schemarouter.h b/server/modules/include/schemarouter.h index 218499865..914d11960 100644 --- a/server/modules/include/schemarouter.h +++ b/server/modules/include/schemarouter.h @@ -27,8 +27,8 @@ #define PCRE2_CODE_UNIT_WIDTH 8 #endif -#include -#include +#include +#include #include #include /** diff --git a/server/modules/include/sharding_common.h b/server/modules/include/sharding_common.h index b676b31d6..0952f6a30 100644 --- a/server/modules/include/sharding_common.h +++ b/server/modules/include/sharding_common.h @@ -16,12 +16,12 @@ #include #include -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include bool extract_database(GWBUF* buf, char* str); void create_error_reply(char* fail_str, DCB* dcb); diff --git a/server/modules/include/telnetd.h b/server/modules/include/telnetd.h index 4b6af5fda..eef8fc4bb 100644 --- a/server/modules/include/telnetd.h +++ b/server/modules/include/telnetd.h @@ -24,8 +24,8 @@ * * @endverbatim */ -#include -#include +#include +#include /** * The telnetd specific protocol structure to put in the DCB. */ diff --git a/server/modules/monitor/auroramon/auroramon.c b/server/modules/monitor/auroramon/auroramon.c index 9095d5d0e..784a7bd96 100644 --- a/server/modules/monitor/auroramon/auroramon.c +++ b/server/modules/monitor/auroramon/auroramon.c @@ -15,12 +15,12 @@ * @file auroramon.c - Amazon RDS Aurora monitor */ -#include -#include -#include +#include +#include +#include #include #include -#include +#include static char *version_str = (char*)"V1.0.0"; diff --git a/server/modules/monitor/galeramon/galeramon.c b/server/modules/monitor/galeramon/galeramon.c index cc1f44a98..781b7e891 100644 --- a/server/modules/monitor/galeramon/galeramon.c +++ b/server/modules/monitor/galeramon/galeramon.c @@ -35,7 +35,7 @@ #include "galeramon.h" -#include +#include #include static void monitorMain(void *); diff --git a/server/modules/monitor/galeramon/galeramon.h b/server/modules/monitor/galeramon/galeramon.h index 15ebe5a26..9fdcd8b27 100644 --- a/server/modules/monitor/galeramon/galeramon.h +++ b/server/modules/monitor/galeramon/galeramon.h @@ -16,18 +16,18 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /** * @file galeramon.h - The Galera cluster monitor diff --git a/server/modules/monitor/mmmon/mmmon.c b/server/modules/monitor/mmmon/mmmon.c index a3809f42b..08197cc10 100644 --- a/server/modules/monitor/mmmon/mmmon.c +++ b/server/modules/monitor/mmmon/mmmon.c @@ -26,7 +26,7 @@ */ #include "mmmon.h" -#include +#include #include static void monitorMain(void *); diff --git a/server/modules/monitor/mmmon/mmmon.h b/server/modules/monitor/mmmon/mmmon.h index aaa6b2ca7..df3747c9a 100644 --- a/server/modules/monitor/mmmon/mmmon.h +++ b/server/modules/monitor/mmmon/mmmon.h @@ -16,18 +16,18 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** * @file mmmon.h - The Multi-Master monitor diff --git a/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h index efbd140f3..b49cb8ba0 100644 --- a/server/modules/monitor/mysqlmon.h +++ b/server/modules/monitor/mysqlmon.h @@ -16,19 +16,19 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include /** * @file mysqlmon.h - The MySQL monitor diff --git a/server/modules/monitor/mysqlmon/mysql_mon.c b/server/modules/monitor/mysqlmon/mysql_mon.c index f454ae84f..901238f44 100644 --- a/server/modules/monitor/mysqlmon/mysql_mon.c +++ b/server/modules/monitor/mysqlmon/mysql_mon.c @@ -46,8 +46,8 @@ */ #include "../mysqlmon.h" -#include -#include +#include +#include #include /** Column positions for SHOW SLAVE STATUS */ diff --git a/server/modules/protocol/CDC/cdc.c b/server/modules/protocol/CDC/cdc.c index c2d0b1897..43471caad 100644 --- a/server/modules/protocol/CDC/cdc.c +++ b/server/modules/protocol/CDC/cdc.c @@ -32,11 +32,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include MODULE_INFO info = diff --git a/server/modules/protocol/HTTPD/httpd.c b/server/modules/protocol/HTTPD/httpd.c index 8430b90ae..c584fd27d 100644 --- a/server/modules/protocol/HTTPD/httpd.c +++ b/server/modules/protocol/HTTPD/httpd.c @@ -34,11 +34,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c index 5f118af6a..598f71330 100644 --- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c +++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c @@ -11,14 +11,14 @@ * Public License. */ -#include "mysql_client_server_protocol.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include /* @@ -50,8 +50,8 @@ * */ #include -#include -#include +#include +#include #include /* @see function load_module in load_utils.c for explanation of the following diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c index d61c1c05d..10e76bf0d 100644 --- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c +++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c @@ -45,21 +45,21 @@ * 07/02/2016 Martin Brampton Split off authentication and SSL. * 31/05/2016 Martin Brampton Implement connection throttling */ -#include -#include +#include +#include #include -#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include -#include +#include #include -#include "gw_authenticator.h" +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/protocol/MySQL/mysql_common.c b/server/modules/protocol/MySQL/mysql_common.c index 834256fe4..0e16ef927 100644 --- a/server/modules/protocol/MySQL/mysql_common.c +++ b/server/modules/protocol/MySQL/mysql_common.c @@ -42,15 +42,15 @@ * */ -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include uint8_t null_client_sha1[MYSQL_SCRAMBLE_LEN] = ""; diff --git a/server/modules/protocol/maxscaled/maxscaled.c b/server/modules/protocol/maxscaled/maxscaled.c index eb9d99169..75f2c660e 100644 --- a/server/modules/protocol/maxscaled/maxscaled.c +++ b/server/modules/protocol/maxscaled/maxscaled.c @@ -14,25 +14,25 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/server/modules/protocol/telnetd/telnetd.c b/server/modules/protocol/telnetd/telnetd.c index 9d94335f2..f0f3a4ddd 100644 --- a/server/modules/protocol/telnetd/telnetd.c +++ b/server/modules/protocol/telnetd/telnetd.c @@ -15,25 +15,25 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/protocol/testprotocol/testprotocol.c b/server/modules/protocol/testprotocol/testprotocol.c index 78bf70c76..0ba45d825 100644 --- a/server/modules/protocol/testprotocol/testprotocol.c +++ b/server/modules/protocol/testprotocol/testprotocol.c @@ -25,10 +25,10 @@ * @endverbatim */ -#include -#include -#include -#include +#include +#include +#include +#include /* @see function load_module in load_utils.c for explanation of the following * lint directives. diff --git a/server/modules/routing/avro/avro.c b/server/modules/routing/avro/avro.c index b5944b640..c580c574e 100644 --- a/server/modules/routing/avro/avro.c +++ b/server/modules/routing/avro/avro.c @@ -29,26 +29,26 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/avro/avro_client.c b/server/modules/routing/avro/avro_client.c index ade20b539..505be1ec4 100644 --- a/server/modules/routing/avro/avro_client.c +++ b/server/modules/routing/avro/avro_client.c @@ -28,21 +28,21 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include extern char *blr_extract_column(GWBUF *buf, int col); extern uint32_t extract_field(uint8_t *src, int bits); diff --git a/server/modules/routing/avro/avro_file.c b/server/modules/routing/avro/avro_file.c index bdd4a5882..05f4b020b 100644 --- a/server/modules/routing/avro/avro_file.c +++ b/server/modules/routing/avro/avro_file.c @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/server/modules/routing/avro/avro_index.c b/server/modules/routing/avro/avro_index.c index 9b88a3a3f..99da0cab2 100644 --- a/server/modules/routing/avro/avro_index.c +++ b/server/modules/routing/avro/avro_index.c @@ -33,7 +33,7 @@ */ #include -#include +#include #include void* safe_key_free(void *data); diff --git a/server/modules/routing/avro/avro_rbr.c b/server/modules/routing/avro/avro_rbr.c index da8f180da..27f68aa98 100644 --- a/server/modules/routing/avro/avro_rbr.c +++ b/server/modules/routing/avro/avro_rbr.c @@ -12,7 +12,7 @@ */ -#include +#include #include #include #include diff --git a/server/modules/routing/avro/avro_schema.c b/server/modules/routing/avro/avro_schema.c index a15c7f450..e7244fa4c 100644 --- a/server/modules/routing/avro/avro_schema.c +++ b/server/modules/routing/avro/avro_schema.c @@ -19,16 +19,16 @@ #endif #include -#include +#include #include #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/server/modules/routing/binlog/binlog_common.c b/server/modules/routing/binlog/binlog_common.c index 11cf6a0c3..f17929fcf 100644 --- a/server/modules/routing/binlog/binlog_common.c +++ b/server/modules/routing/binlog/binlog_common.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include /** * @file binlog_common.c - Common binary log code shared between multiple modules diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c index d6dd22c2d..43f0facea 100644 --- a/server/modules/routing/binlog/blr.c +++ b/server/modules/routing/binlog/blr.c @@ -58,29 +58,29 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include +#include static char *version_str = "V2.1.0"; diff --git a/server/modules/routing/binlog/blr_cache.c b/server/modules/routing/binlog/blr_cache.c index 08758ed72..2f8848ab6 100644 --- a/server/modules/routing/binlog/blr_cache.c +++ b/server/modules/routing/binlog/blr_cache.c @@ -34,18 +34,18 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include /** diff --git a/server/modules/routing/binlog/blr_file.c b/server/modules/routing/binlog/blr_file.c index 7c353212c..14e259036 100644 --- a/server/modules/routing/binlog/blr_file.c +++ b/server/modules/routing/binlog/blr_file.c @@ -47,18 +47,18 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include static int blr_file_create(ROUTER_INSTANCE *router, char *file); diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c index b7edb5cb9..cc33bee65 100644 --- a/server/modules/routing/binlog/blr_master.c +++ b/server/modules/routing/binlog/blr_master.c @@ -55,26 +55,26 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include /* Temporary requirement for auth data */ #include diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c index 6a6c72798..d319d8514 100644 --- a/server/modules/routing/binlog/blr_slave.c +++ b/server/modules/routing/binlog/blr_slave.c @@ -68,24 +68,24 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include extern int load_mysql_users(SERV_LISTENER *listener); extern void blr_master_close(ROUTER_INSTANCE* router); diff --git a/server/modules/routing/binlog/maxbinlogcheck.c b/server/modules/routing/binlog/maxbinlogcheck.c index 4b2007358..4c926ce75 100644 --- a/server/modules/routing/binlog/maxbinlogcheck.c +++ b/server/modules/routing/binlog/maxbinlogcheck.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include diff --git a/server/modules/routing/binlog/test/testbinlog.c b/server/modules/routing/binlog/test/testbinlog.c index a5bbe5897..aaf060cd0 100644 --- a/server/modules/routing/binlog/test/testbinlog.c +++ b/server/modules/routing/binlog/test/testbinlog.c @@ -26,20 +26,20 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -47,7 +47,7 @@ #include #include -#include +#include static void printVersion(const char *progname); static void printUsage(const char *progname); diff --git a/server/modules/routing/cli/cli.c b/server/modules/routing/cli/cli.c index 154ffff92..e5a88e759 100644 --- a/server/modules/routing/cli/cli.c +++ b/server/modules/routing/cli/cli.c @@ -27,19 +27,19 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include MODULE_INFO info = diff --git a/server/modules/routing/debugcli/debugcli.c b/server/modules/routing/debugcli/debugcli.c index 4e143a278..26208b328 100644 --- a/server/modules/routing/debugcli/debugcli.c +++ b/server/modules/routing/debugcli/debugcli.c @@ -26,19 +26,19 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include MODULE_INFO info = diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c index 878047cd4..93bb67d8b 100644 --- a/server/modules/routing/debugcli/debugcmd.c +++ b/server/modules/routing/debugcli/debugcmd.c @@ -51,29 +51,29 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include -#include -#include +#include +#include -#include -#include +#include +#include #include #define MAXARGS 6 diff --git a/server/modules/routing/maxinfo/maxinfo.c b/server/modules/routing/maxinfo/maxinfo.c index 4be542584..21b1a391b 100644 --- a/server/modules/routing/maxinfo/maxinfo.c +++ b/server/modules/routing/maxinfo/maxinfo.c @@ -30,28 +30,28 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include MODULE_INFO info = diff --git a/server/modules/routing/maxinfo/maxinfo_error.c b/server/modules/routing/maxinfo/maxinfo_error.c index f8b813dd1..1dd4c3087 100644 --- a/server/modules/routing/maxinfo/maxinfo_error.c +++ b/server/modules/routing/maxinfo/maxinfo_error.c @@ -26,19 +26,19 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include /** diff --git a/server/modules/routing/maxinfo/maxinfo_exec.c b/server/modules/routing/maxinfo/maxinfo_exec.c index 6fe57476c..bdbfa3d47 100644 --- a/server/modules/routing/maxinfo/maxinfo_exec.c +++ b/server/modules/routing/maxinfo/maxinfo_exec.c @@ -27,24 +27,24 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include static void exec_show(DCB *dcb, MAXINFO_TREE *tree); static void exec_select(DCB *dcb, MAXINFO_TREE *tree); diff --git a/server/modules/routing/maxinfo/maxinfo_parse.c b/server/modules/routing/maxinfo/maxinfo_parse.c index 1a1f415bb..c80b2323c 100644 --- a/server/modules/routing/maxinfo/maxinfo_parse.c +++ b/server/modules/routing/maxinfo/maxinfo_parse.c @@ -27,19 +27,19 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include static MAXINFO_TREE *make_tree_node(MAXINFO_OPERATOR, char *, MAXINFO_TREE *, MAXINFO_TREE *); static void free_tree(MAXINFO_TREE *); diff --git a/server/modules/routing/readconnroute/readconnroute.c b/server/modules/routing/readconnroute/readconnroute.c index 37217b063..d15269635 100644 --- a/server/modules/routing/readconnroute/readconnroute.c +++ b/server/modules/routing/readconnroute/readconnroute.c @@ -74,23 +74,23 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include -#include "modutil.h" +#include MODULE_INFO info = { diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c index 83e8279b2..d9437339b 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.c +++ b/server/modules/routing/readwritesplit/readwritesplit.c @@ -16,17 +16,17 @@ #include #include -#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include MODULE_INFO info = diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.c b/server/modules/routing/readwritesplit/rwsplit_mysql.c index 18c1f5a73..72228395a 100644 --- a/server/modules/routing/readwritesplit/rwsplit_mysql.c +++ b/server/modules/routing/readwritesplit/rwsplit_mysql.c @@ -17,18 +17,18 @@ #include #include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.c b/server/modules/routing/readwritesplit/rwsplit_route_stmt.c index 2e2ca2ab1..bbf690b14 100644 --- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.c +++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include /** diff --git a/server/modules/routing/readwritesplit/rwsplit_select_backends.c b/server/modules/routing/readwritesplit/rwsplit_select_backends.c index dbf50da08..114e118fb 100644 --- a/server/modules/routing/readwritesplit/rwsplit_select_backends.c +++ b/server/modules/routing/readwritesplit/rwsplit_select_backends.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include /** diff --git a/server/modules/routing/readwritesplit/rwsplit_session_cmd.c b/server/modules/routing/readwritesplit/rwsplit_session_cmd.c index d66e7f66f..ddfc0987d 100644 --- a/server/modules/routing/readwritesplit/rwsplit_session_cmd.c +++ b/server/modules/routing/readwritesplit/rwsplit_session_cmd.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/server/modules/routing/readwritesplit/rwsplit_tmp_table_multi.c b/server/modules/routing/readwritesplit/rwsplit_tmp_table_multi.c index 04177f317..41d9e8526 100644 --- a/server/modules/routing/readwritesplit/rwsplit_tmp_table_multi.c +++ b/server/modules/routing/readwritesplit/rwsplit_tmp_table_multi.c @@ -18,9 +18,9 @@ #include /* Note that modutil contains much MySQL specific code */ -#include +#include -#include +#include #include #include /** diff --git a/server/modules/routing/schemarouter/schemarouter.c b/server/modules/routing/schemarouter/schemarouter.c index c7d7c8eb4..35882d9f9 100644 --- a/server/modules/routing/schemarouter/schemarouter.c +++ b/server/modules/routing/schemarouter/schemarouter.c @@ -16,18 +16,18 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/server/modules/routing/testroute/testroute.c b/server/modules/routing/testroute/testroute.c index a553fe245..3fb823ec1 100644 --- a/server/modules/routing/testroute/testroute.c +++ b/server/modules/routing/testroute/testroute.c @@ -12,8 +12,8 @@ */ #include #include -#include -#include +#include +#include static char *version_str = "V1.0.0";