Rename skygw_debug.h to debug.h

Also remove unneded includes in debug.h

avro/maxavro_record.c

@@ -14,7 +14,7 @@
 #include "maxavro.h"
 #include <maxscale/skygw_utils.h>
 #include <string.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/log_manager.h>
 #include <errno.h>
 

avro/maxavro_schema.c

@@ -14,7 +14,7 @@
 #include "maxavro.h"
 #include <jansson.h>
 #include <string.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/log_manager.h>
 
 static const MAXAVRO_SCHEMA_FIELD types[MAXAVRO_TYPE_MAX] =

avro/maxavrocheck.c

@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <getopt.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 static int verbose = 0;
 static uint64_t seekto = 0;

include/maxscale/buffer.h

@@ -46,7 +46,7 @@
 
 #include <maxscale/cdefs.h>
 #include <string.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/hint.h>
 #include <maxscale/spinlock.h>
 #include <stdint.h>

include/maxscale/debug.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _MAXSCALE_SKYGW_DEBUG_H
-#define _MAXSCALE_SKYGW_DEBUG_H
+#ifndef _MAXSCALE_DEBUG_H
+#define _MAXSCALE_DEBUG_H
 /*
  * Copyright (c) 2016 MariaDB Corporation Ab
  *
@@ -15,15 +15,12 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <assert.h>
 #include <limits.h>
-
-#define __USE_UNIX98 1
+#include <stdio.h>
+#include <stdlib.h>
 #include <pthread.h>
-#include <unistd.h>
-#include <stdbool.h>
+#include <maxscale/log_manager.h>
 
 MXS_BEGIN_DECLS
 
@@ -572,4 +569,4 @@ static bool conn_open[10240];
 
 MXS_END_DECLS
 
-#endif /* SKYGW_DEBUG_H */
+#endif

include/maxscale/hashtable.h

@@ -30,7 +30,7 @@
  * @endverbatim
  */
 #include <maxscale/cdefs.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/spinlock.h>
 
 MXS_BEGIN_DECLS

include/maxscale/hint.h

@@ -27,7 +27,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/listmanager.h

@@ -29,7 +29,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/modules.h

@@ -37,7 +37,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/resultset.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/skygw_utils.h

@@ -34,7 +34,7 @@ MXS_BEGIN_DECLS
 #define FSYNCLIMIT 10
 
 #include <maxscale/skygw_types.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 #define DISKWRITE_LATENCY (5*MSEC_USEC)
 

include/maxscale/spinlock.h

@@ -26,7 +26,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc

@@ -56,7 +56,7 @@
 #include <item_func.h>
 
 #include <maxscale/skygw_types.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>

query_classifier/qc_sqlite/builtin_functions.c

@@ -5,7 +5,7 @@
 #include "builtin_functions.h"
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 static struct
 {

server/core/buffer.c

@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <maxscale/alloc.h>
 #include <maxscale/atomic.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/hint.h>

server/core/log_manager.cc

@@ -28,7 +28,7 @@
 #include <maxscale/hashtable.h>
 #include <maxscale/mlist.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/alloc.h>

server/core/mysql_binlog.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <maxscale/log_manager.h>
 #include <string.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/users.h>
 #include <maxscale/dbusers.h>
 #include <strings.h>

server/core/mysql_utils.c

@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/config.h>
 
 /**

server/core/queuemanager.c

@@ -33,7 +33,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/hk_heartbeat.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 #if defined(SS_DEBUG)
 int debug_check_fail = 0;

server/core/skygw_utils.cc

@@ -23,7 +23,7 @@
 #include <time.h>
 #include <stddef.h>
 #include <regex.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/skygw_types.h>
 #include <sys/time.h>
 #include <maxscale/skygw_utils.h>

server/core/spinlock.c

@@ -26,7 +26,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/atomic.h>
 #include <time.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 /**
  * Initialise a spinlock.

server/core/test/testgwbitmask.c

@@ -35,7 +35,7 @@
 
 #include <maxscale/gwbitmask.h>
 
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 /**
  * test1    Create a bitmap and mess around with it

server/core/test/testmaxscalepcre2.c

@@ -35,7 +35,7 @@
 #include <string.h>
 #include <maxscale/alloc.h>
 #include <maxscale/pcre2.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 #define test_assert(a, b) if(!(a)){fprintf(stderr, b);return 1;}
 

server/modules/filter/cache/cache_storage_api.h

@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <maxscale/buffer.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

server/modules/filter/cache/test/testrules.c

@@ -17,7 +17,7 @@
 #if !defined(SS_DEBUG)
 #define SS_DEBUG
 #endif
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 struct test_case
 {

server/modules/filter/luafilter/luafilter.c

@@ -38,7 +38,7 @@
 
 #include <maxscale/skygw_types.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <maxscale/log_manager.h>
 #include <string.h>
 #include <maxscale/filter.h>

server/modules/monitor/auroramon/auroramon.c

@@ -20,7 +20,7 @@
 #include <maxscale/monitor.h>
 #include <mysqld_error.h>
 #include <maxscale/alloc.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 
 static char *version_str = (char*)"V1.0.0";
 

server/modules/routing/avro/avro_index.c

@@ -33,7 +33,7 @@
  */
 
 #include "avrorouter.h"
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <glob.h>
 
 void* safe_key_free(void *data);

server/modules/routing/avro/avro_schema.c

@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <maxscale/skygw_utils.h>
-#include <maxscale/skygw_debug.h>
+#include <maxscale/debug.h>
 #include <string.h>
 #include <strings.h>
 #include <maxscale/alloc.h>