maxscale/maxscale_pcre2.h renamed to maxscale/pcre2.h

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
 

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)

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

server/core/maxscale_pcre2.c

@@ -24,7 +24,7 @@
  * @endverbatim
  */
 
-#include <maxscale/maxscale_pcre2.h>
+#include <maxscale/pcre2.h>
 #include <maxscale/alloc.h>
 
 /**

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)
 {

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>

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;}

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

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>

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>

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>