From 17eda89ed2e24a3fc5f68538dd7fd9ada8efb087 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 3 Jan 2013 20:33:34 -0600 Subject: [PATCH] Remove FcInit() calls from tools Library is supposed to automatically initialize itself. If it doesn't, it's a bug. --- fc-list/fc-list.c | 5 ----- fc-match/fc-match.c | 5 ----- fc-pattern/fc-pattern.c | 5 ----- fc-query/fc-query.c | 6 ------ fc-scan/fc-scan.c | 6 ------ 5 files changed, 27 deletions(-) diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c index eb7b688..5ad1333 100644 --- 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 --- 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 --- 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 --- 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 --- 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++)