MXS-2205 Convert mysql_utils.h to .hh

2018-12-03 11:24:56 +02:00
parent 1701f87f00
commit 3e5818fcb6
31 changed files with 32 additions and 32 deletions
--- a/include/maxscale/mysql_utils.hh
+++ b/include/maxscale/mysql_utils.hh
@ -12,11 +12,11 @@
 */
 #pragma once

-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 #include <stdlib.h>
 #include <stdint.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>

 MXS_BEGIN_DECLS

--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -53,7 +53,7 @@
 #include <maxscale/housekeeper.h>
 #include <maxscale/log.h>
 #include <maxscale/maxscale.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/server.h>
--- a/server/core/modutil.cc
+++ b/server/core/modutil.cc
@ -28,7 +28,7 @@
 #include <maxscale/poll.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/utils.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>

 /** These are used when converting MySQL wildcards to regular expressions */
 static bool pattern_init = false;
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@ -35,7 +35,7 @@
 #include <maxscale/json_api.h>
 #include <maxscale/log.h>
 #include <maxscale/mariadb.hh>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/routingworker.h>
--- a/server/core/mysql_binlog.cc
+++ b/server/core/mysql_binlog.cc
@ -16,7 +16,7 @@
 */

 #include <maxscale/mysql_binlog.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <stdlib.h>
 #include <maxscale/log.h>
 #include <string.h>
--- a/server/core/mysql_utils.cc
+++ b/server/core/mysql_utils.cc
@ -20,7 +20,7 @@
 * row based replication.
 */

-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>

 #include <string.h>
 #include <strings.h>
--- a/server/core/test/test_local_address.cc
+++ b/server/core/test/test_local_address.cc
@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <maxscale/config.hh>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>

 using namespace std;

--- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
@ -19,7 +19,7 @@
 #include <maxscale/authenticator.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/secrets.h>
 #include <maxscale/service.hh>
--- a/server/modules/authenticator/MySQLAuth/dbusers.cc
+++ b/server/modules/authenticator/MySQLAuth/dbusers.cc
@ -25,7 +25,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/log.h>
 #include <maxscale/maxscale.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/pcre2.h>
--- a/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
+++ b/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
@ -18,7 +18,7 @@
 #include <maxscale/jansson.hh>
 #include <maxscale/log.h>
 #include <maxscale/secrets.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>

 #define DEFAULT_PAM_DATABASE_NAME "file:pam.db?mode=memory&cache=shared"
 #define DEFAULT_PAM_TABLE_NAME    "pam_users"
--- a/server/modules/filter/cache/cachefiltersession.cc
+++ b/server/modules/filter/cache/cachefiltersession.cc
@ -16,7 +16,7 @@
 #include <new>
 #include <maxscale/alloc.h>
 #include <maxscale/modutil.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/query_classifier.h>
 #include "storage.hh"

--- a/server/modules/filter/cache/rules.cc
+++ b/server/modules/filter/cache/rules.cc
@ -22,7 +22,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/modutil.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.h>
--- a/server/modules/filter/masking/maskingfiltersession.cc
+++ b/server/modules/filter/masking/maskingfiltersession.cc
@ -19,7 +19,7 @@
 #include <maxscale/buffer.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/modutil.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/poll.h>
 #include <maxscale/protocol/mysql.h>

--- a/server/modules/filter/masking/maskingrules.cc
+++ b/server/modules/filter/masking/maskingrules.cc
@ -19,7 +19,7 @@
 #include <string.h>
 #include <maxbase/assert.h>
 #include <maxscale/jansson.hh>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/pcre2.hh>
 #include <maxscale/utils.hh>
 #include <maxscale/json_api.h>
--- a/server/modules/filter/masking/mysql.hh
+++ b/server/modules/filter/masking/mysql.hh
@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 #include <maxscale/buffer.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.h>

 /**
--- a/server/modules/filter/maxrows/maxrows.cc
+++ b/server/modules/filter/maxrows/maxrows.cc
@ -29,7 +29,7 @@
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
 #include <maxscale/poll.h>
 #include <maxscale/protocol/mysql.h>
--- a/server/modules/monitor/auroramon/auroramon.cc
+++ b/server/modules/monitor/auroramon/auroramon.cc
@ -22,7 +22,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/assert.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>


 AuroraMonitor::AuroraMonitor(MXS_MONITOR* monitor)
--- a/server/modules/monitor/csmon/csmon.cc
+++ b/server/modules/monitor/csmon/csmon.cc
@ -20,7 +20,7 @@
 #include <string>

 #include <maxscale/modinfo.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>

 namespace
 {
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@ -28,7 +28,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/secrets.h>

 #define DONOR_NODE_NAME_MAX_LEN 60
--- a/server/modules/monitor/mariadbmon/cluster_discovery.cc
+++ b/server/modules/monitor/mariadbmon/cluster_discovery.cc
@ -18,7 +18,7 @@
 #include <queue>
 #include <maxbase/format.hh>
 #include <maxscale/modutil.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>

 using std::string;
 using maxbase::string_printf;
--- a/server/modules/monitor/mariadbmon/cluster_manipulation.cc
+++ b/server/modules/monitor/mariadbmon/cluster_manipulation.cc
@ -19,7 +19,7 @@
 #include <maxbase/stopwatch.hh>
 #include <maxbase/format.hh>
 #include <maxscale/clock.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>

 using std::string;
 using std::unique_ptr;
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@ -23,7 +23,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
 #include <maxscale/modulecmd.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/routingworker.h>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>
--- a/server/modules/monitor/mariadbmon/mariadbserver.cc
+++ b/server/modules/monitor/mariadbmon/mariadbserver.cc
@ -20,7 +20,7 @@
 #include <set>
 #include <maxbase/format.hh>
 #include <maxsql/mariadb.hh>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>


 using std::string;
--- a/server/modules/monitor/mariadbmon/server_utils.hh
+++ b/server/modules/monitor/mariadbmon/server_utils.hh
@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 #include <maxbase/stopwatch.hh>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>

 class MariaDBServer;

--- a/server/modules/monitor/mmmon/mmmon.cc
+++ b/server/modules/monitor/mmmon/mmmon.cc
@ -29,7 +29,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/secrets.h>

 static void detectStaleMaster(void*, int);
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.cc
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.cc
@ -19,7 +19,7 @@

 #include "ndbclustermon.hh"
 #include <maxscale/alloc.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>


 NDBCMonitor::NDBCMonitor(MXS_MONITOR* monitor)
--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@ -25,7 +25,7 @@
 #include <maxscale/clock.h>
 #include <maxscale/log.h>
 #include <maxscale/modutil.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/utils.h>
 #include <maxscale/protocol/mariadb_client.hh>
--- a/server/modules/routing/avrorouter/avro_rbr.cc
+++ b/server/modules/routing/avrorouter/avro_rbr.cc
@ -13,7 +13,7 @@

 #include "avrorouter.hh"

-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <jansson.h>
 #include <maxscale/alloc.h>
 #include <strings.h>
--- a/server/modules/routing/avrorouter/avro_schema.cc
+++ b/server/modules/routing/avrorouter/avro_schema.cc
@ -17,7 +17,7 @@

 #include "avrorouter.hh"

-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <jansson.h>
 #include <stdio.h>
 #include <limits.h>
--- a/server/modules/routing/avrorouter/rpl.cc
+++ b/server/modules/routing/avrorouter/rpl.cc
@ -18,7 +18,7 @@
 #include <algorithm>

 #include <maxbase/assert.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.h>

 void gtid_pos_t::extract(const REP_HEADER& hdr, uint8_t* ptr)
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@ -30,7 +30,7 @@
 #include <maxscale/modutil.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/router.h>
-#include <maxscale/mysql_utils.h>
+#include <maxscale/mysql_utils.hh>
 #include <maxscale/routingworker.h>

 #include "rwsplitsession.hh"