[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcinit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Dec 10 10:54:47 2012 +0900

    Remove the duplicate null-check

diff --git a/src/fcinit.c b/src/fcinit.c
index aaf8637..606483d 100644
--- a/src/fcinit.c
+++ b/src/fcinit.c
@@ -83,7 +83,7 @@ FcInitLoadConfig (void)
 	prefix = FcConfigXdgCacheHome ();
 	if (!prefix)
 	    goto bail;
-	plen = prefix ? strlen ((const char *)prefix) : 0;
+	plen = strlen ((const char *)prefix);
 	p = realloc (prefix, plen + 12);
 	if (!p)
 	    goto bail;