commit cb1df8cb28d6ae34726cf7c3fd0142847431c7bb
author Akira TAGOH <akira@tagoh.org> Tue Apr 02 09:37:49 2019 +0000
committer Akira TAGOH <akira@tagoh.org> Wed Apr 03 12:02:09 2019 +0000
tree 891ee4a0e6e56d3b2916f15576bb44c0e3fbd7d9
parent 34791c32f19a3abc6a3dd2000d28202b80a882f9

Don't warn if path can't be converted with prefix

src/fcxml.c

diff --git a/src/fcxml.c b/src/fcxml.c
index 54a26da..d154a54 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -2076,6 +2076,11 @@
 	FcConfigMessage (parse, FcSevereError, "out of memory");
 	return;
     }
+    if (data[0] == 0)
+    {
+	FcConfigMessage (parse, FcSevereWarning, "empty font directory name for remap ignored");
+	return;
+    }
     path = FcConfigGetAttribute (parse, "as-path");
     if (!path)
     {
@@ -2086,7 +2091,9 @@
     salt = FcConfigGetAttribute (parse, "salt");
     prefix = _get_real_path_from_prefix (parse, data, attr);
     if (!prefix || prefix[0] == 0)
-	FcConfigMessage (parse, FcSevereWarning, "empty font directory name for remap ignored");
+    {
+	/* nop */
+    }
     else if (!parse->scanOnly && (!FcStrUsesHome (prefix) || FcConfigHome ()))
     {
 	if (!FcConfigAddFontDir (parse->config, prefix, path, salt))
@@ -2257,11 +2264,18 @@
 	FcConfigMessage (parse, FcSevereError, "out of memory");
 	return;
     }
+    if (data[0] == 0)
+    {
+	FcConfigMessage (parse, FcSevereWarning, "empty font directory name ignored");
+	return;
+    }
     attr = FcConfigGetAttribute (parse, "prefix");
     salt = FcConfigGetAttribute (parse, "salt");
     prefix = _get_real_path_from_prefix (parse, data, attr);
     if (!prefix || prefix[0] == 0)
-	FcConfigMessage (parse, FcSevereWarning, "empty font directory name ignored");
+    {
+	/* nop */
+    }
     else if (!parse->scanOnly && (!FcStrUsesHome (prefix) || FcConfigHome ()))
     {
 	if (!FcConfigAddFontDir (parse->config, prefix, NULL, salt))