From d04cb54b9fae4403b4dd05aada3cd38ec2ac175e Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Thu, 13 Oct 2016 21:11:35 +0300
Subject: [PATCH] maxscale/maxscale_pcre2.h renamed to maxscale/pcre2.h

---
 include/maxscale/externcmd.h                   | 2 +-
 include/maxscale/modutil.h                     | 2 +-
 include/maxscale/{maxscale_pcre2.h => pcre2.h} | 2 +-
 server/core/maxscale_pcre2.c                   | 2 +-
 server/core/modutil.c                          | 2 +-
 server/core/monitor.c                          | 2 +-
 server/core/test/testmaxscalepcre2.c           | 2 +-
 server/modules/filter/cache/rules.h            | 2 +-
 server/modules/filter/dbfwfilter/dbfwfilter.c  | 2 +-
 server/modules/routing/avro/avro_file.c        | 2 +-
 server/modules/routing/avro/avrorouter.h       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename include/maxscale/{maxscale_pcre2.h => pcre2.h} (93%)

diff --git a/include/maxscale/externcmd.h b/include/maxscale/externcmd.h
index ab4ed2460..eed094fdc 100644
--- a/include/maxscale/externcmd.h
+++ b/include/maxscale/externcmd.h
@@ -18,7 +18,7 @@
 #include <errno.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 
 #define MAXSCALE_EXTCMD_ARG_MAX 256
 
diff --git a/include/maxscale/modutil.h b/include/maxscale/modutil.h
index af48ca2ec..9ccc38345 100644
--- a/include/maxscale/modutil.h
+++ b/include/maxscale/modutil.h
@@ -29,7 +29,7 @@
 #include <maxscale/buffer.h>
 #include <maxscale/dcb.h>
 #include <string.h>
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 
 #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/include/maxscale/maxscale_pcre2.h b/include/maxscale/pcre2.h
similarity index 93%
rename from include/maxscale/maxscale_pcre2.h
rename to include/maxscale/pcre2.h
index 494b9e6a0..08c8e2b58 100644
--- a/include/maxscale/maxscale_pcre2.h
+++ b/include/maxscale/pcre2.h
@@ -21,7 +21,7 @@
 #include <pcre2.h>
 
 /**
- * @file maxscale_pcre2.h - Utility functions for regular expression matching
+ * @file pcre2.h - Utility functions for regular expression matching
  * with the bundled PCRE2 library.
  *
  * @verbatim
diff --git a/server/core/maxscale_pcre2.c b/server/core/maxscale_pcre2.c
index 484767994..04133f655 100644
--- a/server/core/maxscale_pcre2.c
+++ b/server/core/maxscale_pcre2.c
@@ -24,7 +24,7 @@
  * @endverbatim
  */
 
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 #include <maxscale/alloc.h>
 
 /**
diff --git a/server/core/modutil.c b/server/core/modutil.c
index 92d4d6bf6..bb78c99e9 100644
--- a/server/core/modutil.c
+++ b/server/core/modutil.c
@@ -1099,7 +1099,7 @@ void prepare_pcre2_patterns()
  * @param string String to match
  * @return MXS_PCRE2_MATCH if the pattern matches, MXS_PCRE2_NOMATCH if it does
  * not match and MXS_PCRE2_ERROR if an error occurred
- * @see maxscale_pcre2.h
+ * @see maxscale/pcre2.h
  */
 mxs_pcre2_result_t modutil_mysql_wildcard_match(const char* pattern, const char* string)
 {
diff --git a/server/core/monitor.c b/server/core/monitor.c
index 8cdafe660..20f29323e 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -36,7 +36,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/secrets.h>
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 #include <maxscale/externcmd.h>
 #include <mysqld_error.h>
 #include <maxscale/mysql_utils.h>
diff --git a/server/core/test/testmaxscalepcre2.c b/server/core/test/testmaxscalepcre2.c
index f75551f0c..b3c1b7395 100644
--- a/server/core/test/testmaxscalepcre2.c
+++ b/server/core/test/testmaxscalepcre2.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <maxscale/alloc.h>
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 #include <maxscale/skygw_debug.h>
 
 #define test_assert(a, b) if(!(a)){fprintf(stderr, b);return 1;}
diff --git a/server/modules/filter/cache/rules.h b/server/modules/filter/cache/rules.h
index 58e04716c..c5590094f 100644
--- a/server/modules/filter/cache/rules.h
+++ b/server/modules/filter/cache/rules.h
@@ -17,7 +17,7 @@
 #include <jansson.h>
 #include <maxscale/buffer.h>
 #include <maxscale/session.h>
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 
 
 typedef enum cache_rule_attribute
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.c b/server/modules/filter/dbfwfilter/dbfwfilter.c
index 72b30917f..01d13dfe1 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.c
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.c
@@ -74,7 +74,7 @@
 #include <time.h>
 #include <assert.h>
 #include <regex.h>
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 #include "dbfwfilter.h"
 #include <ruleparser.yy.h>
 #include <lex.yy.h>
diff --git a/server/modules/routing/avro/avro_file.c b/server/modules/routing/avro/avro_file.c
index 8fe34f3a7..bce83ffc8 100644
--- a/server/modules/routing/avro/avro_file.c
+++ b/server/modules/routing/avro/avro_file.c
@@ -35,7 +35,7 @@
 #include <sys/stat.h>
 #include "avrorouter.h"
 #include <maxscale/log_manager.h>
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 #include <ini.h>
 #include <stdlib.h>
 #include <glob.h>
diff --git a/server/modules/routing/avro/avrorouter.h b/server/modules/routing/avro/avrorouter.h
index 2180327cc..21812bf22 100644
--- a/server/modules/routing/avro/avrorouter.h
+++ b/server/modules/routing/avro/avrorouter.h
@@ -29,7 +29,7 @@
 #include <maxscale/dbusers.h>
 #include <avro.h>
 #include <cdc.h>
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 #include <maxavro.h>
 #include <binlog_common.h>
 #include <sqlite3.h>