Remove FcInit() calls from tools

Library is supposed to automatically initialize itself.  If it doesn't,
it's a bug.

diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index eb7b688..5ad1333 100644 (file)
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -136,11 +136,6 @@ main (int argc, char **argv)
     i = 1;
 #endif
 
-    if (!FcInit ())
-    {
-       fprintf (stderr, "Can't init font config library\n");
-       return 1;
-    }
     if (argv[i])
     {
        pat = FcNameParse ((FcChar8 *) argv[i]);

diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 8ae8ee9..260f404 100644 (file)
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -143,11 +143,6 @@ main (int argc, char **argv)
     i = 1;
 #endif
 
-    if (!FcInit ())
-    {
-       fprintf (stderr, "Can't init font config library\n");
-       return 1;
-    }
     if (argv[i])
     {
        pat = FcNameParse ((FcChar8 *) argv[i]);

diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c
index 84eb1ee..3f066c1 100644 (file)
--- a/fc-pattern/fc-pattern.c
+++ b/fc-pattern/fc-pattern.c
@@ -134,11 +134,6 @@ main (int argc, char **argv)
     i = 1;
 #endif
 
-    if (!FcInit ())
-    {
-       fprintf (stderr, "Can't init font config library\n");
-       return 1;
-    }
     if (argv[i])
     {
        pat = FcNameParse ((FcChar8 *) argv[i]);

diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index 50bef40..883e303 100644 (file)
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -136,12 +136,6 @@ main (int argc, char **argv)
     if (i == argc)
        usage (argv[0], 1);
 
-    if (!FcInit ())
-    {
-       fprintf (stderr, "Can't init font config library\n");
-       return 1;
-    }
-
     for (; i < argc; i++)
     {
        int index;

diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c
index c852e0d..5638b51 100644 (file)
--- a/fc-scan/fc-scan.c
+++ b/fc-scan/fc-scan.c
@@ -126,12 +126,6 @@ main (int argc, char **argv)
     if (i == argc)
        usage (argv[0], 1);
 
-    if (!FcInit ())
-    {
-       fprintf (stderr, "Can't init font config library\n");
-       return 1;
-    }
-
     fs = FcFontSetCreate ();
 
     for (; i < argc; i++)