Move debug related code to debug.c/h

ctags/Makefile.am

@@ -57,6 +57,7 @@ libctags_la_SOURCES = \
 	main/args.h \
 	main/ctags.h \
 	main/debug.h \
+	main/debug.c \
 	main/entry.c \
 	main/entry.h \
 	main/error.c \

ctags/main/debug.c

@@ -0,0 +1,23 @@
+/*
+*   Copyright (c) 1996-2002, Darren Hiebert
+*
+*   This source code is released for free distribution under the terms of the
+*   GNU General Public License version 2 or (at your option) any later version.
+*
+*   This module contains debugging functions.
+*/
+
+/*
+*   INCLUDE FILES
+*/
+#include "general.h"  /* must always come first */
+
+#include <glib.h>
+
+#include "debug.h"
+
+/* wrap g_warning so we don't include glib.h for all parsers, to keep compat with CTags */
+void utils_warn(const char *msg)
+{
+	g_warning("%s", msg);
+}

ctags/main/debug.h

@@ -14,9 +14,18 @@
 */
 #include "general.h"  /* must always come first */
 
-#ifdef DEBUG
-# include <assert.h>
-#endif
 #include "entry.h"
 
+/*
+*   Macros
+*/
+
+/* fake debug statement macro */
+#define DebugStatement(x)      ;
+#define PrintStatus(x)         ;
+/* wrap g_warning so we don't include glib.h for all parsers, to keep compat with CTags */
+extern void utils_warn(const char *msg);
+#define Assert(x) if (!(x)) utils_warn("Assert(" #x ") failed!")
+#define AssertNotReached() Assert(!"The control reaches unexpected place")
+
 #endif  /* CTAGS_MAIN_DEBUG_H */

ctags/main/entry.c

@@ -35,6 +35,7 @@
 #endif
 
 #include "ctags.h"
+#include "debug.h"
 #include "entry.h"
 #include "main.h"
 #include "options.h"

ctags/main/general.h

@@ -96,12 +96,6 @@ int fnmatch(const char *pattern, const char *string, int flags);
 #endif
 
 
-/* fake debug statement macro */
-#define DebugStatement(x)      ;
-#define PrintStatus(x)         ;
-/* wrap g_warning so we don't include glib.h for all parsers, to keep compat with CTags */
-void utils_warn(const char *msg);
-#define Assert(x) if (!(x)) utils_warn("Assert(" #x ") failed!")
 /*
 *   DATA DECLARATIONS
 */

ctags/main/lregex.c

@@ -27,6 +27,7 @@
 # endif
 #endif
 
+#include "debug.h"
 #include "mio.h"
 #include "entry.h"
 #include "parse.h"

ctags/main/main.c

@@ -22,8 +22,6 @@
 */
 #include "general.h"  /* must always come first */
 
-#include <glib.h>
-
 /*  To provide timings features if available.
  */
 #ifdef HAVE_CLOCK
@@ -168,9 +166,3 @@ static void printTotals (const clock_t *const timeStamps)
 }
 
 #endif /* Unused in Geany */
-
-/* wrap g_warning so we don't include glib.h for all parsers, to keep compat with CTags */
-void utils_warn(const char *msg)
-{
-	g_warning("%s", msg);
-}

ctags/main/parse.c

@@ -15,7 +15,7 @@
 
 #include <string.h>
 
-
+#include "debug.h"
 #include "mio.h"
 #include "entry.h"
 #include "keyword.h"

ctags/main/sort.c

@@ -18,6 +18,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "debug.h"
 #include "entry.h"
 #include "routines.h"
 #include "options.h"

ctags/parsers/powershell.c

@@ -14,6 +14,7 @@
 *   INCLUDE FILES
 */
 #include "general.h"  /* must always come first */
+#include "debug.h"
 #include "main.h"
 #include "parse.h"
 #include "read.h"