commit dc8326d3f116bb2a1425aa68660a332e351b6cb4
author Behdad Esfahbod <behdad@behdad.org> Fri Sep 15 01:20:56 2017 -0400
committer Behdad Esfahbod <behdad@behdad.org> Wed Sep 20 13:13:35 2017 -0700
tree 25883fefcb74ae61050de4374c97ed3f2b034262
parent 2db7ca7d5801ba4d3024abedc7d1f11a684879da

[fc-query] Remove --ignore-blanks / -b

Blanks are the new black, err, dead!

fc-query/fc-query.c

diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index 2d2825a..9c9900b 100644
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -52,7 +52,6 @@
 #define _GNU_SOURCE
 #include <getopt.h>
 static const struct option longopts[] = {
-    {"ignore-blanks", 0, 0, 'b'},
     {"index", 1, 0, 'i'},
     {"format", 1, 0, 'f'},
     {"version", 0, 0, 'V'},
@@ -71,22 +70,20 @@
 {
     FILE *file = error ? stderr : stdout;
 #if HAVE_GETOPT_LONG
-    fprintf (file, "usage: %s [-Vbh] [-i index] [-f FORMAT] [--ignore-blanks] [--index index] [--format FORMAT] [--version] [--help] font-file...\n",
+    fprintf (file, "usage: %s [-Vh] [-i index] [-f FORMAT] [--index index] [--format FORMAT] [--version] [--help] font-file...\n",
 	     program);
 #else
-    fprintf (file, "usage: %s [-Vbh] [-i index] [-f FORMAT] font-file...\n",
+    fprintf (file, "usage: %s [-Vh] [-i index] [-f FORMAT] font-file...\n",
 	     program);
 #endif
     fprintf (file, "Query font files and print resulting pattern(s)\n");
     fprintf (file, "\n");
 #if HAVE_GETOPT_LONG
-    fprintf (file, "  -b, --ignore-blanks  ignore blanks to compute langauges\n");
     fprintf (file, "  -i, --index INDEX    display the INDEX face of each font file only\n");
     fprintf (file, "  -f, --format=FORMAT  use the given output format\n");
     fprintf (file, "  -V, --version        display font config version and exit\n");
     fprintf (file, "  -h, --help           display this help and exit\n");
 #else
-    fprintf (file, "  -b         (ignore-blanks) ignore blanks to compute languages\n");
     fprintf (file, "  -i INDEX   (index)         display the INDEX face of each font file only\n");
     fprintf (file, "  -f FORMAT  (format)        use the given output format\n");
     fprintf (file, "  -V         (version)       display font config version and exit\n");
@@ -99,25 +96,20 @@
 main (int argc, char **argv)
 {
     unsigned int id = (unsigned int) -1;
-    int		ignore_blanks = 0;
     FcFontSet   *fs;
     FcChar8     *format = NULL;
-    FcBlanks    *blanks = NULL;
     int		err = 0;
     int		i;
 #if HAVE_GETOPT_LONG || HAVE_GETOPT
     int		c;
 
 #if HAVE_GETOPT_LONG
-    while ((c = getopt_long (argc, argv, "bi:f:Vh", longopts, NULL)) != -1)
+    while ((c = getopt_long (argc, argv, "i:f:Vh", longopts, NULL)) != -1)
 #else
-    while ((c = getopt (argc, argv, "bi:f:Vh")) != -1)
+    while ((c = getopt (argc, argv, "i:f:Vh")) != -1)
 #endif
     {
 	switch (c) {
-	case 'b':
-	    ignore_blanks = 1;
-	    break;
 	case 'i':
 	    id = (unsigned int) strtol (optarg, NULL, 0); /* strtol() To handle -1. */
 	    break;
@@ -143,12 +135,10 @@
 	usage (argv[0], 1);
 
     fs = FcFontSetCreate ();
-    if (!ignore_blanks)
-	blanks = FcConfigGetBlanks (NULL);
 
     for (; i < argc; i++)
     {
-	if (!FcFreeTypeQueryAll ((FcChar8*) argv[i], id, blanks, NULL, fs))
+	if (!FcFreeTypeQueryAll ((FcChar8*) argv[i], id, NULL, NULL, fs))
 	{
 	    fprintf (stderr, "Can't query face %u of font file %s\n", id, argv[i]);
 	    err = 1;