[Indic] Apply Indic features

[framework/uifw/harfbuzz.git] / src / hb-ot-tag.cc

diff --git a/src/hb-ot-tag.cc b/src/hb-ot-tag.cc
index 5d47115..0ce635a 100644 (file)
--- a/src/hb-ot-tag.cc
+++ b/src/hb-ot-tag.cc
@@ -586,10 +586,10 @@ lang_compare_first_component (const char *a,
   unsigned int da, db;
   const char *p;
 
-  p = strstr (a, "-");
+  p = strchr (a, '-');
   da = p ? (unsigned int) (p - a) : strlen (a);
 
-  p = strstr (b, "-");
+  p = strchr (b, '-');
   db = p ? (unsigned int) (p - b) : strlen (b);
 
   return strncmp (a, b, MAX (da, db));
@@ -610,7 +610,7 @@ hb_ot_tag_from_language (hb_language_t language)
   const char *lang_str, *s;
   const LangTag *lang_tag;
 
-  if (language == NULL)
+  if (language == HB_LANGUAGE_INVALID)
     return HB_OT_TAG_DEFAULT_LANGUAGE;
 
   lang_str = hb_language_to_string (language);
@@ -686,7 +686,7 @@ hb_ot_tag_to_language (hb_tag_t tag)
     }
   }
 
-  /* Else return a custom language in the form of "x-hbotXXXX" */
+  /* Else return a custom language in the form of "x-hbotABCD" */
   {
     unsigned char buf[11] = "x-hbot";
     buf[6] = tag >> 24;