X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffccharset.c;h=3dac4ce6a378d627187245e36959c209778e2283;hb=18b6857c6476517db7932025847ae952feba758d;hp=43aa22c46d873ccc55288047a222db1dba07bd3d;hpb=bc5e487f2a1ad9946aa5c6e19cd75794fc38d530;p=fontconfig.git diff --git a/src/fccharset.c b/src/fccharset.c index 43aa22c..3dac4ce 100644 --- a/src/fccharset.c +++ b/src/fccharset.c @@ -1169,7 +1169,7 @@ FcCharSetFindFrozen (FcCharSetFreezer *freezer, const FcCharSet *orig) return NULL; } -static const FcCharSet * +const FcCharSet * FcCharSetFreeze (FcCharSetFreezer *freezer, const FcCharSet *fcs) { FcCharSet *b; @@ -1177,10 +1177,6 @@ FcCharSetFreeze (FcCharSetFreezer *freezer, const FcCharSet *fcs) FcCharLeaf *l; int i; - n = FcCharSetFindFrozen (freezer, fcs); - if (n) - return n; - b = FcCharSetCreate (); if (!b) goto bail0; @@ -1217,7 +1213,7 @@ bail0: return n; } -static FcCharSetFreezer * +FcCharSetFreezer * FcCharSetFreezerCreate (void) { FcCharSetFreezer *freezer; @@ -1279,6 +1275,9 @@ FcCharSetSerializeAlloc (FcSerialize *serialize, const FcCharSet *cs) if (!serialize->cs_freezer) return FcFalse; } + if (FcCharSetFindFrozen (serialize->cs_freezer, cs)) + return FcTrue; + cs = FcCharSetFreeze (serialize->cs_freezer, cs); }