Imported Upstream version 2.13.1

[platform/upstream/fontconfig.git] / src / fcdbg.c

diff --git a/src/fcdbg.c b/src/fcdbg.c
index c2853ff..e2c6b56 100644 (file)
--- a/src/fcdbg.c
+++ b/src/fcdbg.c
@@ -46,7 +46,10 @@ _FcValuePrintFile (FILE *f, const FcValue v)
        fprintf (f, "\"%s\"", v.u.s);
        break;
     case FcTypeBool:
-       fprintf (f, "%s", v.u.b ? "True" : "False");
+       fprintf (f,
+                v.u.b == FcTrue  ? "True" :
+                v.u.b == FcFalse ? "False" :
+                                   "DontCare");
        break;
     case FcTypeMatrix:
        fprintf (f, "[%g %g; %g %g]", v.u.m->xx, v.u.m->xy, v.u.m->yx, v.u.m->yy);
@@ -62,7 +65,7 @@ _FcValuePrintFile (FILE *f, const FcValue v)
        fprintf (f, "face");
        break;
     case FcTypeRange:
-       fprintf (f, "[%g %g)", v.u.r->begin, v.u.r->end);
+       fprintf (f, "[%g %g]", v.u.r->begin, v.u.r->end);
        break;
     }
 }
@@ -184,22 +187,21 @@ FcCharSetPrint (const FcCharSet *c)
 void
 FcPatternPrint (const FcPattern *p)
 {
-    int                    i;
-    FcPatternElt   *e;
+    FcPatternIter iter;
 
     if (!p)
     {
        printf ("Null pattern\n");
        return;
     }
-    printf ("Pattern has %d elts (size %d)\n", p->num, p->size);
-    for (i = 0; i < p->num; i++)
+    printf ("Pattern has %d elts (size %d)\n", FcPatternObjectCount (p), p->size);
+    FcPatternIterStart (p, &iter);
+    do
     {
-       e = &FcPatternElts(p)[i];
-       printf ("\t%s:", FcObjectName(e->object));
-       FcValueListPrint (FcPatternEltValues(e));
+       printf ("\t%s:", FcPatternIterGetObject (p, &iter));
+       FcValueListPrint (FcPatternIterGetValues (p, &iter));
        printf ("\n");
-    }
+    } while (FcPatternIterNext (p, &iter));
     printf ("\n");
 }
 
@@ -476,6 +478,9 @@ FcTestPrint (const FcTest *test)
     case FcMatchScan:
        printf ("scan ");
        break;
+    case FcMatchKindEnd:
+       /* shouldn't be reached */
+       return;
     }
     switch (test->qual) {
     case FcQualAny:
@@ -508,13 +513,12 @@ FcEditPrint (const FcEdit *edit)
 }
 
 void
-FcSubstPrint (const FcSubst *subst)
+FcRulePrint (const FcRule *rule)
 {
-    FcRule *r;
     FcRuleType last_type = FcRuleUnknown;
+    const FcRule *r;
 
-    printf ("match\n");
-    for (r = subst->rule; r; r = r->next)
+    for (r = rule; r; r = r->next)
     {
        if (last_type != r->type)
        {