From 3e5818fcb65f0bc1f278e78831abc8ef0fbba08b Mon Sep 17 00:00:00 2001
From: Esa Korhonen <esa.korhonen@mariadb.com>
Date: Mon, 3 Dec 2018 11:24:56 +0200
Subject: [PATCH] MXS-2205 Convert mysql_utils.h to .hh

---
 include/maxscale/{mysql_utils.h => mysql_utils.hh}            | 4 ++--
 server/core/gateway.cc                                        | 2 +-
 server/core/modutil.cc                                        | 2 +-
 server/core/monitor.cc                                        | 2 +-
 server/core/mysql_binlog.cc                                   | 2 +-
 server/core/mysql_utils.cc                                    | 2 +-
 server/core/test/test_local_address.cc                        | 2 +-
 server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc | 2 +-
 server/modules/authenticator/MySQLAuth/dbusers.cc             | 2 +-
 server/modules/authenticator/PAM/PAMAuth/pam_instance.cc      | 2 +-
 server/modules/filter/cache/cachefiltersession.cc             | 2 +-
 server/modules/filter/cache/rules.cc                          | 2 +-
 server/modules/filter/masking/maskingfiltersession.cc         | 2 +-
 server/modules/filter/masking/maskingrules.cc                 | 2 +-
 server/modules/filter/masking/mysql.hh                        | 2 +-
 server/modules/filter/maxrows/maxrows.cc                      | 2 +-
 server/modules/monitor/auroramon/auroramon.cc                 | 2 +-
 server/modules/monitor/csmon/csmon.cc                         | 2 +-
 server/modules/monitor/galeramon/galeramon.cc                 | 2 +-
 server/modules/monitor/mariadbmon/cluster_discovery.cc        | 2 +-
 server/modules/monitor/mariadbmon/cluster_manipulation.cc     | 2 +-
 server/modules/monitor/mariadbmon/mariadbmon.cc               | 2 +-
 server/modules/monitor/mariadbmon/mariadbserver.cc            | 2 +-
 server/modules/monitor/mariadbmon/server_utils.hh             | 2 +-
 server/modules/monitor/mmmon/mmmon.cc                         | 2 +-
 server/modules/monitor/ndbclustermon/ndbclustermon.cc         | 2 +-
 server/modules/protocol/MySQL/mysql_common.cc                 | 2 +-
 server/modules/routing/avrorouter/avro_rbr.cc                 | 2 +-
 server/modules/routing/avrorouter/avro_schema.cc              | 2 +-
 server/modules/routing/avrorouter/rpl.cc                      | 2 +-
 server/modules/routing/readwritesplit/readwritesplit.cc       | 2 +-
 31 files changed, 32 insertions(+), 32 deletions(-)
 rename include/maxscale/{mysql_utils.h => mysql_utils.hh} (98%)

diff --git a/include/maxscale/mysql_utils.h b/include/maxscale/mysql_utils.hh
similarity index 98%
rename from include/maxscale/mysql_utils.h
rename to include/maxscale/mysql_utils.hh
index 3a393819a..e49790d89 100644
--- a/include/maxscale/mysql_utils.h
+++ 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
 
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 73a102bec..ac0153a69 100644
--- 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>
diff --git a/server/core/modutil.cc b/server/core/modutil.cc
index a4c236a74..7a727ea9c 100644
--- 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;
diff --git a/server/core/monitor.cc b/server/core/monitor.cc
index d271a0a33..ed31fc49d 100644
--- 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>
diff --git a/server/core/mysql_binlog.cc b/server/core/mysql_binlog.cc
index 6cda4b2ea..677171f88 100644
--- 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>
diff --git a/server/core/mysql_utils.cc b/server/core/mysql_utils.cc
index df7b4b338..036486410 100644
--- 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>
diff --git a/server/core/test/test_local_address.cc b/server/core/test/test_local_address.cc
index 54078f4cc..01fcd3f47 100644
--- 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;
 
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
index b6252810b..3094e520f 100644
--- 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>
diff --git a/server/modules/authenticator/MySQLAuth/dbusers.cc b/server/modules/authenticator/MySQLAuth/dbusers.cc
index 001ecee23..905ba860e 100644
--- 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>
diff --git a/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc b/server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
index 5dc2e8c77..f98dcf1c4 100644
--- 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"
diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc
index 9cbf3c8eb..5d1aae0a2 100644
--- 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"
 
diff --git a/server/modules/filter/cache/rules.cc b/server/modules/filter/cache/rules.cc
index 270d73657..b8ea8020c 100644
--- 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>
diff --git a/server/modules/filter/masking/maskingfiltersession.cc b/server/modules/filter/masking/maskingfiltersession.cc
index c1bee083b..a44d81a64 100644
--- 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>
 
diff --git a/server/modules/filter/masking/maskingrules.cc b/server/modules/filter/masking/maskingrules.cc
index 47029074b..d584624b5 100644
--- 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>
diff --git a/server/modules/filter/masking/mysql.hh b/server/modules/filter/masking/mysql.hh
index e4293719b..b434ca764 100644
--- 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>
 
 /**
diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc
index 8322f305a..ce7a02c77 100644
--- 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>
diff --git a/server/modules/monitor/auroramon/auroramon.cc b/server/modules/monitor/auroramon/auroramon.cc
index c83f8110a..35db1e9b5 100644
--- 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)
diff --git a/server/modules/monitor/csmon/csmon.cc b/server/modules/monitor/csmon/csmon.cc
index 4e369d8df..98afda71b 100644
--- 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
 {
diff --git a/server/modules/monitor/galeramon/galeramon.cc b/server/modules/monitor/galeramon/galeramon.cc
index 034f0c569..527d54371 100644
--- 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
diff --git a/server/modules/monitor/mariadbmon/cluster_discovery.cc b/server/modules/monitor/mariadbmon/cluster_discovery.cc
index 6338b57d2..d3861c6b3 100644
--- 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;
diff --git a/server/modules/monitor/mariadbmon/cluster_manipulation.cc b/server/modules/monitor/mariadbmon/cluster_manipulation.cc
index b66cb6c58..210e1f733 100644
--- 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;
diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc
index 363a5a21e..67a47fd45 100644
--- 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>
diff --git a/server/modules/monitor/mariadbmon/mariadbserver.cc b/server/modules/monitor/mariadbmon/mariadbserver.cc
index 7cbef9813..41623d050 100644
--- 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;
diff --git a/server/modules/monitor/mariadbmon/server_utils.hh b/server/modules/monitor/mariadbmon/server_utils.hh
index 64d9cd24a..0e62e5a11 100644
--- 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;
 
diff --git a/server/modules/monitor/mmmon/mmmon.cc b/server/modules/monitor/mmmon/mmmon.cc
index be1470f51..752e61960 100644
--- 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);
diff --git a/server/modules/monitor/ndbclustermon/ndbclustermon.cc b/server/modules/monitor/ndbclustermon/ndbclustermon.cc
index a534ba25e..1eca598ae 100644
--- 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)
diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc
index cdb8fd1e1..deef95c4d 100644
--- 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>
diff --git a/server/modules/routing/avrorouter/avro_rbr.cc b/server/modules/routing/avrorouter/avro_rbr.cc
index ac3629e00..f9c157662 100644
--- 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>
diff --git a/server/modules/routing/avrorouter/avro_schema.cc b/server/modules/routing/avrorouter/avro_schema.cc
index e0e95eff9..fb556f024 100644
--- 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>
diff --git a/server/modules/routing/avrorouter/rpl.cc b/server/modules/routing/avrorouter/rpl.cc
index 108088b79..742ec6128 100644
--- 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)
diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc
index 01d9dff9b..05beed9d1 100644
--- 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"