Combine maxscale/buffer.h with maxscale/buffer.hh

2019-01-16 12:36:00 +02:00
parent 5d959a30ac
commit 3b55893a20
40 changed files with 431 additions and 469 deletions
--- a/server/modules/authenticator/HTTPAuth/http_auth.cc
+++ b/server/modules/authenticator/HTTPAuth/http_auth.cc
@ -30,7 +30,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <openssl/bio.h>
 #include <maxscale/service.hh>
 #include <maxscale/secrets.h>
--- a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
+++ b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
@ -32,7 +32,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/adminusers.h>
 #include <maxscale/users.h>

--- a/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc
+++ b/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc
@ -32,7 +32,7 @@
 #include <maxscale/authenticator.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/users.h>

 /** MXS-1026: Without MySQL protocol data structures, the NullAuth authenticator will crash. */
--- a/server/modules/authenticator/NullAuthDeny/null_auth_deny.cc
+++ b/server/modules/authenticator/NullAuthDeny/null_auth_deny.cc
@ -32,7 +32,7 @@
 #include <maxscale/authenticator.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/users.h>

 static bool null_auth_set_protocol_data(DCB* dcb, GWBUF* buf);
--- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
+++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
@ -19,6 +19,6 @@

 #include <maxscale/ccdefs.hh>

-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.hh>
--- a/server/modules/filter/cache/cache.cc
+++ b/server/modules/filter/cache/cache.cc
@ -18,7 +18,7 @@
 #include <string>
 #include <zlib.h>
 #include <maxscale/alloc.h>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>
 #include <maxscale/paths.h>
--- a/server/modules/filter/cache/cache.hh
+++ b/server/modules/filter/cache/cache.hh
@ -17,7 +17,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/session.hh>

 #include "rules.hh"
--- a/server/modules/filter/cache/cache_storage_api.hh
+++ b/server/modules/filter/cache/cache_storage_api.hh
@ -21,7 +21,7 @@
 #include <functional>
 #include <string>

-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/protocol/mysql.hh>

 typedef enum cache_result_bits
--- a/server/modules/filter/cache/cachefiltersession.hh
+++ b/server/modules/filter/cache/cachefiltersession.hh
@ -13,7 +13,7 @@
 #pragma once

 #include <maxscale/ccdefs.hh>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/filter.hh>
 #include "cache.hh"
 #include "cachefilter.hh"
--- a/server/modules/filter/cache/rules.hh
+++ b/server/modules/filter/cache/rules.hh
@ -19,7 +19,7 @@
 #include <jansson.h>
 #include <memory>
 #include <vector>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/session.hh>
 #include <maxscale/pcre2.h>

--- a/server/modules/filter/cache/test/tester.hh
+++ b/server/modules/filter/cache/test/tester.hh
@ -13,7 +13,7 @@
 #pragma once

 #include <maxscale/ccdefs.hh>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <ostream>
 #include <string>
 #include <vector>
--- a/server/modules/filter/dbfwfilter/rules.cc
+++ b/server/modules/filter/dbfwfilter/rules.cc
@ -16,7 +16,7 @@
 #include <algorithm>

 #include <maxscale/alloc.h>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>

--- a/server/modules/filter/insertstream/insertstream.cc
+++ b/server/modules/filter/insertstream/insertstream.cc
@ -17,7 +17,7 @@

 #include <strings.h>
 #include <maxscale/alloc.h>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
--- a/server/modules/filter/masking/mysql.hh
+++ b/server/modules/filter/masking/mysql.hh
@ -17,7 +17,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.hh>

--- a/server/modules/filter/maxrows/maxrows.cc
+++ b/server/modules/filter/maxrows/maxrows.cc
@ -22,7 +22,7 @@

 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
--- a/server/modules/filter/test/maxscale/mock/mock.hh
+++ b/server/modules/filter/test/maxscale/mock/mock.hh
@ -15,7 +15,7 @@
 #include <maxscale/ccdefs.hh>
 #include <string>
 #include <string.h>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>


--- a/server/modules/protocol/MySQL/mariadbclient/test/test_setparser.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/test/test_setparser.cc
@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <iostream>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/paths.h>

 using namespace std;
--- a/server/modules/protocol/MySQL/mariadbclient/test/test_setsqlmodeparser.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/test/test_setsqlmodeparser.cc
@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <iostream>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/paths.h>

 using namespace std;
--- a/server/modules/protocol/MySQL/mariadbclient/test/test_sqlmodeparser.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/test/test_sqlmodeparser.cc
@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <iostream>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/paths.h>

 using namespace std;
--- a/server/modules/protocol/maxscaled/maxscaled.cc
+++ b/server/modules/protocol/maxscaled/maxscaled.cc
@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/protocol.hh>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
--- a/server/modules/protocol/telnetd/telnetd.cc
+++ b/server/modules/protocol/telnetd/telnetd.cc
@ -20,7 +20,7 @@
 #include <string.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/service.hh>
 #include <maxscale/session.hh>
 #include <maxscale/protocol.hh>
--- a/server/modules/routing/binlogrouter/blr.hh
+++ b/server/modules/routing/binlogrouter/blr.hh
@ -31,7 +31,7 @@
 #include <thread>
 #include <vector>

-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/router.hh>
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@ -42,7 +42,7 @@

 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/protocol/mysql.hh>
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@ -38,7 +38,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/alloc.h>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/filter.hh>
--- a/server/modules/routing/schemarouter/schemarouterinstance.cc
+++ b/server/modules/routing/schemarouter/schemarouterinstance.cc
@ -21,7 +21,7 @@
 #include <strings.h>

 #include <maxscale/alloc.h>
-#include <maxscale/buffer.h>
+#include <maxscale/buffer.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>