Inline FcDebug invocations and only initialize once, in FcInit*. Improve

    debug msg in FcPatternPrint.
reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index a94de3c71907a923bf7f3641caa2e7c7b3654aaf..ac81063467c3879a0e040e8b5d55e170be51146d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-24  Dirk Mueller <dmueller@suse.com>
+       reviewed by: plam
+       
+       * src/fcdbg.c (FcDebug, FcDebugInit, FcPatternPrint):
+       * src/fcinit.c (FcInitLoadConfig, FcInitLoadConfigAndFonts):
+       * src/fcint.h (FcDebug):
+       
+       Inline FcDebug invocations and only initialize once, in FcInit*.
+       Improve debug msg in FcPatternPrint.
+
 2005-11-23  Frederic Crozat  <fcrozat@mandriva.com>:
        reviewed by: plam
        

diff --git a/src/fcdbg.c b/src/fcdbg.c
index c7e05701cbc2480555ca7913a673bf89c7b3c490..607ddc1e46fc916759df50b4fc4801a367ed576b 100644 (file)
--- a/src/fcdbg.c
+++ b/src/fcdbg.c
@@ -106,7 +106,7 @@ FcPatternPrint (const FcPattern *p)
        printf ("Null pattern\n");
        return;
     }
-    printf ("Pattern %d of %d\n", p->num, p->size);
+    printf ("Pattern has %d elts (size %d)\n", p->num, p->size);
     for (i = 0; i < p->num; i++)
     {
        e = FcPatternEltU(p->elts) + i;
@@ -339,25 +339,19 @@ FcFontSetPrint (const FcFontSet *s)
     }
 }
 
-int
-FcDebug (void)
+int FcDebugVal;
+
+void
+FcInitDebug (void)
 {
-    static int  initialized;
-    static int  debug;
+    char    *e;
 
-    if (!initialized)
+    e = getenv ("FC_DEBUG");
+    if (e)
     {
-       char    *e;
-
-       initialized = 1;
-       e = getenv ("FC_DEBUG");
-       if (e)
-       {
-           printf ("FC_DEBUG=%s\n", e);
-           debug = atoi (e);
-           if (debug < 0)
-               debug = 0;
-       }
+        printf ("FC_DEBUG=%s\n", e);
+        FcDebugVal = atoi (e);
+        if (FcDebugVal < 0)
+           FcDebugVal = 0;
     }
-    return debug;
 }

diff --git a/src/fcinit.c b/src/fcinit.c
index 151c429f9115138152a15bbcbb03f7702b9d2cba..3a742a892e24639d2ada2c4e6460a93d1d16622d 100644 (file)
--- a/src/fcinit.c
+++ b/src/fcinit.c
@@ -57,6 +57,7 @@ FcInitLoadConfig (void)
 {
     FcConfig   *config;
     
+    FcInitDebug ();
     config = FcConfigCreate ();
     if (!config)
        return FcFalse;
@@ -78,6 +79,7 @@ FcInitLoadConfigAndFonts (void)
 {
     FcConfig   *config = FcInitLoadConfig ();
 
+    FcInitDebug ();
     if (!config)
        return 0;
     if (!FcConfigBuildFonts (config))

diff --git a/src/fcint.h b/src/fcint.h
index 4dbb7b4b0abb06ca9cba92c57433a30f652ffa6d..1b545bca8d99323ce16ded7a099d1401ff584245 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -594,8 +594,13 @@ FcEditPrint (const FcEdit *edit);
 void
 FcSubstPrint (const FcSubst *subst);
 
-int
-FcDebug (void);
+extern int FcDebugVal;
+
+static __inline__ int
+FcDebug (void) { return FcDebugVal; }
+
+void
+FcInitDebug (void);
 
 /* fcdefault.c */
 FcChar8 *