From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 16 Nov 2009 20:43:08 +0000 (-0500)
Subject: [int] Remove fc_storage_type() in favor of direct access to v->type
X-Git-Tag: 2.8.0~20
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=888f9427ae84195104855d2bb2fbb6d44067a998;p=fontconfig.git

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

diff --git a/src/fcint.h b/src/fcint.h
index 14008a3..78591c1 100644
--- 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 0d84704..ecb5aa9 100644
--- 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 792a164..90d42ca 100644
--- 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: