* include/freetype/internal/ftdebug.h, src/base/ftdebug.c: modified
the debug sub-system initialization. trace levels can now be specified
within the "FT2_DEBUG" environment variable. See the comments within
"ftdebug.c" for more details
* include/freetype/internal/fttrace.h: new file to define the trace
levels used for debugging. it is used both to define enums and
toggle names for FT2_DEBUG
* src/base/ftobjs.c, src/base/ftstream.c: FT_Assert renamed to
FT_ASSERT
* include/freetype/internal/ftextend.h, src/base/ftextend.c,
src/base/Jamfile, src/base/rules.mk: removing "ftextend" from the
library, since it is now completely obsolete..
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index 6a3fc49..ea4033a 100644
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -45,12 +45,7 @@
#include FT_INTERNAL_DEBUG_H
-#ifdef FT_DEBUG_LEVEL_TRACE
- char ft_trace_levels[trace_max];
-#endif
-
-
-#if defined( FT_DEBUG_LEVEL_ERROR ) || defined( FT_DEBUG_LEVEL_TRACE )
+#if defined( FT_DEBUG_LEVEL_ERROR )
#include <stdarg.h>
@@ -83,36 +78,123 @@
exit( EXIT_FAILURE );
}
+#endif /* FT_DEBUG_LEVEL_ERROR */
+
+
#ifdef FT_DEBUG_LEVEL_TRACE
- FT_EXPORT_DEF( void )
- FT_SetTraceLevel( FT_Trace component,
- char level )
+ /* array of trace levels, initialized to 0 */
+ int ft_trace_levels[ trace_count ];
+
+ /* define array of trace toggle names */
+#define FT_TRACE_DEF(x) #x ,
+
+ static const char* ft_trace_toggles[ trace_count+1 ] =
+ {
+#include FT_INTERNAL_TRACE_H
+ NULL
+ };
+
+#undef FT_TRACE_DEF
+
+
+
+ /************************************************************************
+ *
+ * initialize the tracing sub-system, this is done by retrieving the
+ * value of the "FT2_DEBUG" environment variable. It must be a list of
+ * toggles, separated by spaces, ';' or ':' for example:
+ *
+ * "any=3 memory=6 stream=5"
+ *
+ * will request that all levels be set to 3, except the trace level for
+ * the memory and stream components which are respectively set to 6 and 5
+ *
+ * see the file <freetype/internal/fttrace.h> for details of the available
+ * toggle names.
+ *
+ * the level is between 0 and 6, where 0 is quiet (except in important
+ * runtime errors), and 6 is _very_ verbose
+ */
+
+ FT_BASE_DEF( void )
+ ft_debug_init( void )
{
- if ( component >= trace_max )
- return;
-
- /* if component is `trace_any', change _all_ levels at once */
- if ( component == trace_any )
+ const char* ft2_debug = getenv( "FT2_DEBUG" );
+
+ if ( ft2_debug )
{
- int n;
-
-
- for ( n = trace_any; n < trace_max; n++ )
- ft_trace_levels[n] = level;
+ const char* p = ft2_debug;
+ const char* q;
+
+ for ( ; *p; p++ )
+ {
+ /* skip leading whitespace and separators */
+ if ( *p == ' ' || *p == '\t' || *p == ':' || *p == ';' || *p == '=' )
+ continue;
+
+ /* read toggle name, followed by '=' */
+ q = p;
+ while ( *p && *p != '=' )
+ p++;
+
+ if ( *p == '=' && p > q )
+ {
+ int n, i, len = p - q;
+ int level = -1, found = -1;
+
+ for ( n = 0; n < trace_count; n++ )
+ {
+ const char* toggle = ft_trace_toggles[n];
+
+ for ( i = 0; i < len; i++ )
+ {
+ if ( toggle[i] != q[i] )
+ break;
+ }
+
+ if ( i == len && toggle[i] == 0 )
+ {
+ found = n;
+ break;
+ }
+ }
+
+ /* read level */
+ p++;
+ if ( *p )
+ {
+ level = *p++ - '0';
+ if ( level < 0 || level > 6 )
+ level = -1;
+ }
+
+ if ( found >= 0 && level >= 0 )
+ {
+ if ( found == trace_any )
+ {
+ /* special case for "any" */
+ for ( n = 0; n < trace_count; n++ )
+ ft_trace_levels[n] = level;
+ }
+ else
+ ft_trace_levels[ found ] = level;
+ }
+ }
+ }
}
- else /* otherwise, only change individual component */
- ft_trace_levels[component] = level;
}
-#endif /* FT_DEBUG_LEVEL_TRACE */
+#else /* !FT_DEBUG_LEVEL_TRACE */
-#endif /* FT_DEBUG_LEVEL_TRACE || FT_DEBUG_LEVEL_ERROR */
+ FT_BASE_DEF( void )
+ ft_debut_init( void )
+ {
+ /* nothing */
+ }
-
- /* ANSI C doesn't allow empty files, so we insert a dummy symbol */
- extern const int ft_debug_dummy;
+#endif /* !FT_DEBUG_LEVEL_TRACE */
/* END */