fix trace levels

4 files changed, 18 insertions, 17 deletions

diff --git a/src/base/ftdbgmem.c b/src/base/ftdbgmem.c
index 16620afa2..3658a0b29 100644
--- a/src/base/ftdbgmem.c
+++ b/src/base/ftdbgmem.c
@@ -746,15 +746,15 @@
       mem_limit_site_total = ft_mem_check_site_alloc_environment( source, "FT2_ALLOC_TOTAL_MAX_SITE" );
       mem_limit_site_cur   = ft_mem_check_site_alloc_environment( source, "FT2_ALLOC_CUR_MAX_SITE" );
       if ( mem_limit_site_total >= 0 || mem_limit_site_cur >= 0 )
-        FT_TRACE1(("ft_mem_table_set() invoked by %s:%lu, limit:( "));
+        FT_TRACE6(("ft_mem_table_set() invoked by %s:%lu, limit:( "));
       if ( mem_limit_site_total >= 0 )
-        FT_TRACE1(("%ld =< %ld", source->all_size + size, mem_limit_site_total ));
+        FT_TRACE6(("%ld =< %ld", source->all_size + size, mem_limit_site_total ));
       if ( mem_limit_site_total >= 0 && mem_limit_site_cur >= 0 )
-        FT_TRACE1((" && "));
+        FT_TRACE6((" && "));
       if ( mem_limit_site_cur >= 0 )
-        FT_TRACE1(("%ld =< %ld", source->cur_size + size, mem_limit_site_cur ));
+        FT_TRACE6(("%ld =< %ld", source->cur_size + size, mem_limit_site_cur ));
       if ( mem_limit_site_total >= 0 || mem_limit_site_cur >= 0 )
-        FT_TRACE1((" )\n"));
+        FT_TRACE6((" )\n"));
 
       if ( mem_limit_site_total >= 0 && mem_limit_site_total < ( source->all_size + size ) )
         exceeds_limit_site_total = TRUE;
@@ -763,7 +763,7 @@
 
       if ( exceeds_limit_site_total || exceeds_limit_site_cur )
       {
-        FT_TRACE1(("ft_mem_table_set() returns NULL to %s:%lu, allocation request exceeds %s-limit (%lu > %lu)\n",
+        FT_TRACE6(("ft_mem_table_set() returns NULL to %s:%lu, allocation request exceeds %s-limit (%lu > %lu)\n",
                    basename( (char*)source->file_name ), source->line_no,
                    ( exceeds_limit_site_total ? "site-total" : "site-current" ),
                    ( exceeds_limit_site_total ? source->all_size : source->cur_size ) + size,
diff --git a/src/cache/ftccache.h b/src/cache/ftccache.h
index 323892a02..3f531ab01 100644
--- a/src/cache/ftccache.h
+++ b/src/cache/ftccache.h
@@ -226,10 +226,11 @@ FT_BEGIN_HEADER
     FT_Bool               _list_changed = FALSE;                         \
                                                                          \
                                                                          \
-    FT_TRACE7(("FTC_CACHE_LOOKUP_CMP() lookup object for "));            \
-    FT_TRACE7(("hash=0x%08x in cache ", _hash ));                        \
-    FT_TRACE7(("mask=0x%08x p=0x%08x ", _cache->mask, _cache->p ));      \
-    FT_TRACE7(("list length=%d\n", ftc_get_list_length( _cache, _hash ) )); \
+    FT_TRACE6(("FTC_CACHE_LOOKUP_CMP() lookup object for "));            \
+    FT_TRACE6(("hash=0x%08x in cache ", _hash ));                        \
+    FT_TRACE6(("mask=0x%08x p=0x%08x ", _cache->mask, _cache->p ));      \
+    FT_TRACE7(("list length=%d", ftc_get_list_length( _cache, _hash ) )); \
+    FT_TRACE6(("\n"));                                                   \
                                                                          \
     error = FTC_Err_Ok;                                                  \
     node  = NULL;                                                        \
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 827dd5e4e..79d0253a9 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -649,12 +649,12 @@
     FT_UInt   result;
 
 
-    FT_TRACE1(("%s() tries to free %d nodes from list length=%d\n", __FUNCTION__, count, ft_get_length_nodes_list( manager->nodes_list ) ));
+    FT_TRACE2(("%s() tries to free %d nodes from list length=%d\n", __FUNCTION__, count, ft_get_length_nodes_list( manager->nodes_list ) ));
 
     /* try to remove `count' nodes from the list */
     if ( first == NULL )  /* empty list! */
     {
-      FT_TRACE1(("%s() cannot change empty list\n", __FUNCTION__ ));
+      FT_TRACE2(("%s() cannot change empty list\n", __FUNCTION__ ));
       return 0;
     }
 
@@ -677,7 +677,7 @@
 
       node = prev;
     }
-    FT_TRACE1(("%s() freed %d nodes, list length=%d\n", __FUNCTION__, result, ft_get_length_nodes_list( manager->nodes_list ) ));
+    FT_TRACE2(("%s() freed %d nodes, list length=%d\n", __FUNCTION__, result, ft_get_length_nodes_list( manager->nodes_list ) ));
     return  result;
   }
 
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index 097c8d84c..957858014 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -125,7 +125,7 @@
     sbit->buffer = 0;
 
     error = clazz->family_load_glyph( family, gindex, manager, &face );
-    FT_TRACE1(("ftc_snode_load() got error from family_load_glyph() err=0x%02x%s\n", error, error ? " fallback to BadGlyph" : "" ));
+    FT_TRACE2(("ftc_snode_load() got %s from family_load_glyph() err=0x%02x%s\n", error ? "error" : "ok", error, error ? " fallback to BadGlyph" : "" ));
     if ( error )
       goto BadGlyph;
 
@@ -201,7 +201,7 @@
         *asize = 0;
     }
 
-    FT_TRACE7(("ftc_snode_load() load glyph for gid=%d, err=0x%02x\n", gindex, error));
+    FT_TRACE2(("ftc_snode_load() load glyph for gid=%d, err=0x%02x\n", gindex, error));
     return error;
   }
 
@@ -336,7 +336,7 @@
     FT_Bool     result;
 
 
-    FT_TRACE1(( "ftc_snode_compare() work for gindex=%d\n", gindex ));
+    FT_TRACE2(( "ftc_snode_compare() work for gindex=%d\n", gindex ));
     if (list_changed)
       *list_changed = FALSE;
     result = FT_BOOL( gnode->family == gquery->family                    &&
@@ -403,7 +403,7 @@
       }
     }
 
-    FT_TRACE1(("%s() returns %s\n", __FUNCTION__, result ? "TRUE" : "FALSE"));
+    FT_TRACE2(("%s() returns %s\n", __FUNCTION__, result ? "TRUE" : "FALSE"));
     return result;
   }