Overhaul the serialization system to create one mmapable file per directory

[fontconfig.git] / src / fcdbg.c

diff --git a/src/fcdbg.c b/src/fcdbg.c
index c8b7127b356ae97fc5a5283ee7d41a5ff06aad45..c7e05701cbc2480555ca7913a673bf89c7b3c490 100644 (file)
--- a/src/fcdbg.c
+++ b/src/fcdbg.c
@@ -40,24 +40,20 @@ FcValuePrint (const FcValue v)
        printf (" %g(f)", v.u.d);
        break;
     case FcTypeString:
-       printf (" \"%s\"", FcObjectPtrU(v.u.si));
+       printf (" \"%s\"", v.u.s);
        break;
     case FcTypeBool:
        printf (" %s", v.u.b ? "FcTrue" : "FcFalse");
        break;
     case FcTypeMatrix:
-    {
-       FcMatrix *m = FcMatrixPtrU(v.u.mi);
-
-       printf (" (%f %f; %f %f)", m->xx, m->xy, m->yx, m->yy);
+       printf (" (%f %f; %f %f)", v.u.m->xx, v.u.m->xy, v.u.m->yx, v.u.m->yy);
        break;
-    }
     case FcTypeCharSet:        /* XXX */
        printf (" set");
        break;
     case FcTypeLangSet:
        printf (" ");
-       FcLangSetPrint (FcLangSetPtrU(v.u.li));
+       FcLangSetPrint (v.u.l);
        break;
     case FcTypeFTFace:
        printf (" face");
@@ -70,7 +66,7 @@ FcValueListPrint (FcValueListPtr l)
 {
     for (; FcValueListPtrU(l); l = FcValueListPtrU(l)->next)
     {
-       FcValuePrint (FcValueListPtrU(l)->value);
+       FcValuePrint (FcValueCanonicalize(&FcValueListPtrU(l)->value));
        switch (FcValueListPtrU(l)->binding) {
        case FcValueBindingWeak:
            printf ("(w)");