SF.net SVN: geany:[4580] branches/geany-0.18.1

[ntrel at users.sourceforge.net]

Revision: 4580
          http://geany.svn.sourceforge.net/geany/?rev=4580&view=rev
Author:   ntrel
Date:     2010-01-28 16:57:05 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
Backport:
Make TagManager Assert statements cause g_warning on failure.

Modified Paths:
--------------
    branches/geany-0.18.1/ChangeLog
    branches/geany-0.18.1/tagmanager/ctags.c
    branches/geany-0.18.1/tagmanager/general.h

Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog	2010-01-28 16:47:32 UTC (rev 4579)
+++ branches/geany-0.18.1/ChangeLog	2010-01-28 16:57:05 UTC (rev 4580)
@@ -1,3 +1,9 @@
+2009-11-12  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * tagmanager/ctags.c, tagmanager/general.h:
+   Make TagManager Assert statements cause g_warning on failure.
+
+
 2009-10-26  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * HACKING:

Modified: branches/geany-0.18.1/tagmanager/ctags.c
===================================================================
--- branches/geany-0.18.1/tagmanager/ctags.c	2010-01-28 16:47:32 UTC (rev 4579)
+++ branches/geany-0.18.1/tagmanager/ctags.c	2010-01-28 16:57:05 UTC (rev 4580)
@@ -1392,4 +1392,10 @@
 }
 #endif
 
+/* 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);
+}
+
 /* vi:set tabstop=8 shiftwidth=4: */

Modified: branches/geany-0.18.1/tagmanager/general.h
===================================================================
--- branches/geany-0.18.1/tagmanager/general.h	2010-01-28 16:47:32 UTC (rev 4579)
+++ branches/geany-0.18.1/tagmanager/general.h	2010-01-28 16:57:05 UTC (rev 4580)
@@ -205,8 +205,9 @@
 /* fake debug statement macro */
 #define DebugStatement(x)      ;
 #define PrintStatus(x)	       ;
-#define Assert(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
 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.