[int] Remove fc_storage_type() in favor of direct access to v->type

diff --git a/src/fcint.h b/src/fcint.h
index 14008a34d9780f74f335f46f682d9cc2c81e5ab9..78591c151e9dc3a1ff176f3d15aa9fdc056458fd 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -426,7 +426,6 @@ typedef struct _FcCaseFold {
 #define fc_value_string(v)     FcValueString(v)
 #define fc_value_charset(v)    FcValueCharSet(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_ALLOC       0xFC02FC05

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 0d84704b51abfff52eba73837ebf11aebbe8b3cd..ecb5aa9b352f1750786453b806486f6dc2670032 100644 (file)
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -129,7 +129,7 @@ FcCompareLang (FcValue *v1, FcValue *v2)
 static double
 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 (double) v2->u.b != v1->u.b;
 }

diff --git a/src/fcpat.c b/src/fcpat.c
index 792a164f9dddf3462525e16067205d469891d72c..90d42cacd636218a2c00dff95fa84650cf557a00 100644 (file)
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -220,7 +220,7 @@ FcStringHash (const FcChar8 *s)
 static FcChar32
 FcValueHash (const FcValue *v)
 {
-    switch (fc_storage_type(v)) {
+    switch (v->type) {
     case FcTypeVoid:
        return 0;
     case FcTypeInteger: