[int] Remove fc_storage_type() in favor of direct access to v->type
This commit is contained in:
parent
486fa46893
commit
888f9427ae
|
@ -426,7 +426,6 @@ typedef struct _FcCaseFold {
|
||||||
#define fc_value_string(v) FcValueString(v)
|
#define fc_value_string(v) FcValueString(v)
|
||||||
#define fc_value_charset(v) FcValueCharSet(v)
|
#define fc_value_charset(v) FcValueCharSet(v)
|
||||||
#define fc_value_langset(v) FcValueLangSet(v)
|
#define fc_value_langset(v) FcValueLangSet(v)
|
||||||
#define fc_storage_type(v) ((v)->type)
|
|
||||||
|
|
||||||
#define FC_CACHE_MAGIC_MMAP 0xFC02FC04
|
#define FC_CACHE_MAGIC_MMAP 0xFC02FC04
|
||||||
#define FC_CACHE_MAGIC_ALLOC 0xFC02FC05
|
#define FC_CACHE_MAGIC_ALLOC 0xFC02FC05
|
||||||
|
|
|
@ -129,7 +129,7 @@ FcCompareLang (FcValue *v1, FcValue *v2)
|
||||||
static double
|
static double
|
||||||
FcCompareBool (FcValue *v1, FcValue *v2)
|
FcCompareBool (FcValue *v1, FcValue *v2)
|
||||||
{
|
{
|
||||||
if (fc_storage_type(v2) != FcTypeBool || fc_storage_type(v1) != FcTypeBool)
|
if (v2->type != FcTypeBool || v1->type != FcTypeBool)
|
||||||
return -1.0;
|
return -1.0;
|
||||||
return (double) v2->u.b != v1->u.b;
|
return (double) v2->u.b != v1->u.b;
|
||||||
}
|
}
|
||||||
|
|
|
@ -220,7 +220,7 @@ FcStringHash (const FcChar8 *s)
|
||||||
static FcChar32
|
static FcChar32
|
||||||
FcValueHash (const FcValue *v)
|
FcValueHash (const FcValue *v)
|
||||||
{
|
{
|
||||||
switch (fc_storage_type(v)) {
|
switch (v->type) {
|
||||||
case FcTypeVoid:
|
case FcTypeVoid:
|
||||||
return 0;
|
return 0;
|
||||||
case FcTypeInteger:
|
case FcTypeInteger:
|
||||||
|
|
Loading…
Reference in New Issue