Merge with HEAD and finish the GCC 4 cleanups (no more warnings!)

[fontconfig.git] / fc-glyphname / fc-glyphname.c

diff --git a/fc-glyphname/fc-glyphname.c b/fc-glyphname/fc-glyphname.c
index 5b38c72c832d7bc56763ddda38b190c19f0a0ed9..2c69c2b407dbbbf1785cabcd5e58cba4f71657d7 100644 (file)
--- a/fc-glyphname/fc-glyphname.c
+++ b/fc-glyphname/fc-glyphname.c
@@ -105,7 +105,7 @@ scan (FILE *f, char *filename)
        gn = FcAllocGlyphName ((FcChar32) ucs, (FcChar8 *) name);
        if (!gn)
            fatal (filename, lineno, "out of memory");
-       len = strlen ((FcChar8 *) name);
+       len = strlen (name);
        if (len > max_name_len)
            max_name_len = len;
        raw[nraw++] = gn;
@@ -286,7 +286,7 @@ main (int argc, char **argv)
     for (i = 0; i < nraw; i++)
        printf ("static struct { FcChar32 ucs; FcChar8 name[%d]; }"
                " glyph%d = { 0x%lx, \"%s\" };\n",
-               (int) strlen (raw[i]->name) + 1,
+               (int) strlen ((char *) raw[i]->name) + 1,
                i, (unsigned long) raw[i]->ucs, raw[i]->name);
 
     /*