commit 8f08c3275040870a645ef034a38d30c05c619f21
author Behdad Esfahbod <behdad@behdad.org> Fri Oct 08 19:43:48 2010 -0400
committer Behdad Esfahbod <behdad@behdad.org> Fri Oct 08 19:51:03 2010 -0400
tree 3558946743384c260469aea57aa2edc27484093a
parent a806762a314e83154793d96ee665e6668d6b56de

Minor cleanup

src/hb-ot-tag.c

diff --git a/src/hb-ot-tag.c b/src/hb-ot-tag.c
index 448f795..32d455d 100644
--- a/src/hb-ot-tag.c
+++ b/src/hb-ot-tag.c
@@ -591,10 +591,9 @@
 };
 
 static int
-lang_compare_first_component (const void *pa,
-			      const void *pb)
+lang_compare_first_component (const char *a,
+			      const char *b)
 {
-  const char *a = pa, *b = pb;
   unsigned int da, db;
   const char *p;
 
@@ -645,7 +644,7 @@
   /* find a language matching in the first component */
   lang_tag = bsearch (lang_str, ot_languages,
 		      ARRAY_LENGTH (ot_languages), sizeof (LangTag),
-		      lang_compare_first_component);
+		      (hb_compare_func_t) lang_compare_first_component);
 
   /* we now need to find the best language matching */
   if (lang_tag)
@@ -654,12 +653,12 @@
 
     /* go to the final one matching in the first component */
     while (lang_tag + 1 < ot_languages + ARRAY_LENGTH (ot_languages) &&
-	   lang_compare_first_component (lang_str, lang_tag + 1) == 0)
+	   lang_compare_first_component (lang_str, (lang_tag + 1)->language) == 0)
       lang_tag++;
 
     /* go back, find which one matches completely */
     while (lang_tag >= ot_languages &&
-	   lang_compare_first_component (lang_str, lang_tag) == 0)
+	   lang_compare_first_component (lang_str, lang_tag->language) == 0)
     {
       if (lang_matches (lang_str, lang_tag->language)) {
 	found = TRUE;