diff options
| author | Patrick Lam <plam@MIT.EDU> | 2005-07-07 12:09:10 +0000 |
|---|---|---|
| committer | Patrick Lam <plam@MIT.EDU> | 2005-07-07 12:09:10 +0000 |
| commit | 0fa680f0766a8f545b20a7935a19e9db5529f903 (patch) | |
| tree | a56276a9a884e5f7c9297a3ccf92a266eab1359d /src/fccfg.c | |
| parent | cd2ec1a940888ebcbd323a8000d2fcced41ddf9e (diff) | |
Convert ObjectPtr from a fat structure to a simple index into an id table;
ids can be positive (for static strings) or negative (for dynamic
strings). Static strings belong to a single buffer, while dynamic
strings are independently allocated.
Diffstat (limited to 'src/fccfg.c')
| -rw-r--r-- | src/fccfg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/fccfg.c b/src/fccfg.c index 1ce7cbe0..7be4cdd4 100644 --- a/src/fccfg.c +++ b/src/fccfg.c @@ -632,7 +632,8 @@ FcConfigCompareValue (const FcValue left_o, FcObjectPtrU(right.u.si)) != 0; break; case FcOpNotEqual: - ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) != 0; + ret = FcStrCmpIgnoreCase (FcObjectPtrU(left.u.si), + FcObjectPtrU(right.u.si)) != 0; break; case FcOpNotContains: ret = FcStrCmpIgnoreCase (FcObjectPtrU(left.u.si), @@ -759,7 +760,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e) break; case FcOpString: v.type = FcTypeString; - v.u.si = FcObjectPtrCreateDynamic(e->u.sval); + v.u.si = FcObjectStaticName(e->u.sval); v = FcValueSave (v); break; case FcOpMatrix: @@ -877,7 +878,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e) switch (e->op) { case FcOpPlus: v.type = FcTypeString; - v.u.si = FcObjectPtrCreateDynamic + v.u.si = FcObjectStaticName (FcStrPlus (FcObjectPtrU(vl.u.si), FcObjectPtrU(vr.u.si))); |